Migrate to composer packaging
Merge branch 'composer-migrate' into dev
Merge branch 'dev'