Merge -c 1075938 from trunk to 1.5 branch.  Fixes AVRO-769.

git-svn-id: https://svn.apache.org/repos/asf/avro/branches/branch-1.5@1075941 13f79535-47bb-0310-9956-ffa450edef68
9 files changed