merging alexcrichton/rust/std-sync = 22464edb into auto