sync master @20130804