sync master @20130906
sync master @20130906