Merge upstream20140725