Merge "Merge branch 'master' of https://gerrit.lilingkun.com/G12Project"