Update to Rust master
Merge pull request #360 from cmr/fix-master

Update to Rust master