pre-merge
Merge branch 'master' of git@github.com:BlueprintDevTeam/paritaire.git