Merge branch 'master' into zh-work
Merge branch 'zh-work' into oschina