sync master @20130812