am e6eb0085: Merge "Fix compilation with clang and GCC 4.7"

* commit 'e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1':
  Fix compilation with clang and GCC 4.7