王潇然 更多改为我 2013.8.10
Merge remote-tracking branch 'origin'