sync master @20130826
sync master @20130829