merging alexcrichton/rust/issue-20068 = 1582a599 into auto