Fix build
Merge pull request #477 from bjz/rustup

Fix build