Merge in master up to r1693670

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