merge @20140727