am 7193731a: Merge "Workaround g++ 4.7 compfail"

* commit '7193731ae6b8083bc7a5e5e468fb98b1dbcf3f3d':
  Workaround g++ 4.7 compfail