merging alexcrichton/rust/issue-20068 = 3b4f94a8 into auto