Comment 7 for bug 1371805

Thanks! Uploaded. I made a couple of very minor changes to the changelog: I explicitly said "to fix FTBFS" so others can see why we uploaded during feature freeze, and I moved the note about the test fix patch "up a level" to make it clear that it's being added in this merge, rather than being brought forward from the last one.

I also just noticed (after uploading) that there was no bug reference in the changelog to close this bug, so I'll close this manually. Sorry, I need to get better at this sponsoring thing.