sync with rust-nightly

Fixes #22