Coding standards
Merge branch 'master' into installer