Merge upstream

[2shortplanks]

This brings in work from pull request from our local fork, passed back upstream.

Since nothing else has been merged upstream I'm not expecting this to either, but I'm doing this so that people can at least see what changes we've made.