Merge pull request #1176 from birkenfeld/master

rustup