Merge -c 1166407 from trunk to 1.5 branch.  Fixes: AVRO-866.

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