alexcrichton Merge pull request #133 from jethrogb/rust-bug-56942
Cherry pick bug fix
Latest commit 6923965 Dec 18, 2018