merge 20140708