Fixes codestyle issues
Merge branch 'master' into simpletests