Auto merge of #4109 - Manishearth:backport-merge, r=phansch

Merge backport branches into master

Attempt 2 at #4103

This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds