Merge upstream20140702