sync master @20130825