Project-specific code style formatting
Merge branch 'master' into kruland-integration