minor style change
Merge branch 'master' into develop-chris