Merge upstream20140626