Adds code climate again
Merge branch 'master' into staging