merging alexcrichton/rust/issue-20068 = 0999df79 into auto