Auto merge of #4513 - durka:patch-6, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 20 Sep 2017 17:32:37 +0000 (17:32 +0000)
committerbors <bors@rust-lang.org>
Wed, 20 Sep 2017 17:32:37 +0000 (17:32 +0000)
[patch] slipped to 1.21


Trivial merge