On the fsx branch: final sync with /trunk.
Conflicts in spillbuf.c and spillbuf-test.c resolved.

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