Merge pull request #112 from dtolnay/build

Restore compatibility with rustc 1.15-1.16