Minor coding style fixes
Merge branch 'release' into development