Remove some duplication
Merge branch 'master' of git@github.com:flack/openpsa.git
Try another workaround for composer problem