Auto merge of #4696 - paulkernfeld:master, r=matklad
authorbors <bors@rust-lang.org>
Fri, 3 Nov 2017 05:27:45 +0000 (05:27 +0000)
committerbors <bors@rust-lang.org>
Fri, 3 Nov 2017 05:27:45 +0000 (05:27 +0000)
Note that token can be read from stdin


Trivial merge