Merge branch 'master' into 201408091420
Merge branch '201408091420'
修正Clover的小错误
Merge branch 'Mac'