同步到最新

username-removed-81213 requested to merge github/fork/wentaozone/master into master Jun 19, 2013