Merge branch 'develop' of https://github.com/jplattel/organization.supply into develop