Fix coding standard error
Merge branch 'master' into 2.4