Merge branch 'master' into lingjun
Adjust style for most modules.
Merge branch 'lingjun'