* Merged TYPO3_3-6-0 branch changes by robert into HEAD. See 3.6.0 branch change...