Manually merge pull request: https://github.com/google/protobuf/pull/674
that fixes the gcc C++11 build.