On the javahl-1.8-extensions branch: Cherry-picked r1636101 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/javahl-1.8-extensions@1636105 13f79535-47bb-0310-9956-ffa450edef68