Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 27c9f71cd0a0ff148a04af34bdb62604bfa37683.
lvcy

2014-8-28 2:31