Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/acp/page/MediaListPage.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/option/Option.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/User.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/cronjob/AssignTrophiesCronjob.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/html/metacode/converter/CodeMetacodeConverter.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabQuote.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
Simple merge