Small changes to code-standards.
Just pushing it.
Merge branch 'release/2.2.2.0.1'