REL_3_10_FINAL
merge REL_3_10_FINAL with trunk r1563413

git-svn-id: https://svn.apache.org/repos/asf/poi/tags/REL_3_10_FINAL@1563415 13f79535-47bb-0310-9956-ffa450edef68