Coding style
Coding style
Merge branch 'master' into devel