Auto merge of #4517 - durka:patch-7, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 21 Sep 2017 03:36:14 +0000 (03:36 +0000)
committerbors <bors@rust-lang.org>
Thu, 21 Sep 2017 03:36:14 +0000 (03:36 +0000)
[patch] slipped to 1.21, mark 2

Same as #4513, apparently it showed up in a few places.


Trivial merge