Finished 'quill teapot fix'

'quill teapot fix' is ready to test on Windows and Linux; it works on
OSX.