merge 20140901