Fix deprecation env specs
Merge branch 'master' of github.com:localshred/protobuf
Bump version 2.6.4