Fix more breakage similar to rust-lang/rust#36340 and 11f118643#223
Merged
sfackler merged 1 commit intosfackler:masterfrom Nov 30, 2016
Merged
Fix more breakage similar to rust-lang/rust#36340 and 11f118643#223sfackler merged 1 commit intosfackler:masterfrom
sfackler merged 1 commit intosfackler:masterfrom