merge 20140612