20140608 merge