Merge branch 'master' of https://github.com/DemandCube/developer-setup