TYPO3 Core

On latest HEAD from today I get an DB-Error directly after hitting "Update Wizard":

exec_SELECTquery
caller     TYPO3\CMS\Core\Database\DatabaseConnection::exec_SELECTquery
ERROR     Illegal mix of collations (utf8_general_ci,IMPLICIT) and (utf8_unicode_ci,IMPLICIT) for operation '<>'
lastBuiltQuery     SELECT COUNT(uid) FROM tt_content WHERE media <> '' AND CAST(CAST(media AS DECIMAL) AS CHAR) <> media OR (CType = 'uploads' AND select_key != '')
debug_backtrace     TYPO3\CMS\Install\Controller\ToolController->execute#134 // TYPO3\CMS\Install\Controller\ToolController->dispatchAuthenticationActions#74 // TYPO3\CMS\Install\Controller\Action\Tool\UpdateWizard->handle#176 // TYPO3\CMS\Install\Controller\Action\Tool\UpdateWizard->listUpdates#58 // TYPO3\CMS\Install\Updates\AbstractUpdate->shouldRenderWizard#83 // TYPO3\CMS\Install\Updates\TtContentUploadsUpdateWizard->checkForUpdate#127 // TYPO3\CMS\Core\Database\DatabaseConnection->exec_SELECTcountRows#105 // TYPO3\CMS\Core\Database\DatabaseConnection->exec_SELECTquery#426 // TYPO3\CMS\Core\Database\DatabaseConnection->debug#297

This sounds odd, since I'm using the following in my.cnf:

character_set_server=utf8
collation-server = utf8_unicode_ci
init-connect='SET NAMES utf8'
init_connect='SET collation_connection = utf8_unicode_ci'
skip-character-set-client-handshake

Manually checked the db, no occurrances of "utf8_general_ci". All "Datebase Checks" show green, same with Extension Checks. FE and BE are otherwise working.