:fish:
Merge branch 'trait-hackathon' of https://github.com/thehyve/dalliance-plugin into trait-hackathon