Auto merge of #1888 - achanda:1878, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 11 Aug 2015 01:26:53 +0000 (01:26 +0000)
committerbors <bors@rust-lang.org>
Tue, 11 Aug 2015 01:26:53 +0000 (01:26 +0000)
Closes #1878


Trivial merge