Auto merge of rust-lang#30100 - jFransham:patch-1, r=steveklabnik

Fixes rust-lang#30093 in the most trivial possible way.

1.4.0 release

1.3.0 release

1.2.0 release

1.1.0 release

1.0.0 release

1.0.0-alpha.2 release

1.0.0-alpha release

0.12.0 release