Jing Zhao d611f42c37 Merge r1578669 from trunk. %!s(int64=11) %!d(string=hai) anos
..
main c993d1bac5 merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238 %!s(int64=13) %!d(string=hai) anos
test d611f42c37 Merge r1578669 from trunk. %!s(int64=11) %!d(string=hai) anos