On the fsfs-improvements branch: sync with /trunk.
There were no conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsfs-improvements@1536949 13f79535-47bb-0310-9956-ffa450edef68