[REFACTOR] Merge branch 'master' into typo3-development

* Sync both environments
Merge pull request #1 from bmoex/typo3-development

[REFACTOR] Merge branch 'master' into typo3-development