rust-lang/rust — pull request #18492 by alexcrichton (2014-10-31 17:37:02+00:00)
Title: Rolling up PRs in the queue

mini rollup!