Merge branch 'osx-wantwrite' into release-0.14

Fix the WantWriteError test on OS X (purely a test bug).