Merge branch 'master' of https://github.com/style80-2/m.wepiao into zhan...

...gxl