Merge upstream/master into rustup-20140624-2