Merge branch 'features/packages' of github.com:enfonius/matrix into features/packages
Merge branch 'features/packages'