* Merging all changes from TYPO3_4-0 branch back into HEAD