Jan Tattermusch 1b34aeb554 fixing x64 build with vs2015 10 lat temu
..
build f96dfc3cf8 First round of fixing up implicit 64->32 bit conversions 10 lat temu
core 1b34aeb554 fixing x64 build with vs2015 10 lat temu
cpp 5ff97a27a9 Merge pull request #4479 from ctiller/aarons-bug 10 lat temu
proto d88e1d8f4e merge with head and resolve conflict 10 lat temu