composer tweak
Merge remote-tracking branch 'origin/master' into work-dev