Merge rustc (1.18.0+dfsg1-4) import into refs/heads/workingbranch
authorXimin Luo <infinity0@debian.org>
Tue, 25 Jul 2017 21:19:47 +0000 (22:19 +0100)
committerXimin Luo <infinity0@debian.org>
Tue, 25 Jul 2017 21:19:47 +0000 (22:19 +0100)

Trivial merge