20140806 merge