Merge branch 'master' of github.com:guardian/composer-restorer
Merge branch 'master' into re-groundwork