Merge branch 'master' into next

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

diff --cc wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
Simple merge

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

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

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

diff --cc wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
Simple merge

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