test
Merge branch 'master' of https://github.com/jpcharrier/coding-standards into change-2