Merge pull request #35 from kivitendo/f-shopware6-rebase1