am c2be68e4: Merge "Remove gcc 4.9 workaround."

* commit 'c2be68e4f688f61ea5c23183b8eaeb4e34aa1c56':
  Remove gcc 4.9 workaround.