[TASK] Anticipate bug with TYPO3 6.1