utACK 412d5fe

These commits are missing the Github-Pull and Rebased-From metadata that we normally add to backports.

The commit were written before the branch (and are located on top of a common ancestor of master+0.20) , so I think the script doesn't need the metadata.

@fanquake This isn't a backport per se; it's the original branch, exactly the same commits just merged into master.

Appveyor is failing a test because the commit that fixed the error isn't included in this branch.

This commit is included in the 0.20 branch.

All tests passed on my local machine when git cherry-picked the commit to this branch.

This is a two-line code fix with a two-line test. The risk of breaking something is low, so I think this can go into final without another rc. Thoughts?

I would strongly prefer not to include any code change (no matter how minor) to the binaries in -final that is not in any rc.
As this is not a regression in 0.20, I think this can wait until 0.20.1.
(unless, of course, there happens to be need another rc for 0.20.0 then it can go in anyway)