Merge rustc (1.21.0+dfsg1-2) import into refs/heads/workingbranch
authorXimin Luo <infinity0@debian.org>
Wed, 25 Oct 2017 18:27:30 +0000 (19:27 +0100)
committerXimin Luo <infinity0@debian.org>
Wed, 25 Oct 2017 18:27:30 +0000 (19:27 +0100)

Trivial merge