0.9.11 issue 1652 scott

I might have solved the conflicts! I might have even done it properly!

(It would be easier to examine against the latest master branch, I imagine, since it has all the latest merged commits, and thus the diff looks scary.)