Merge branch 'master' into next

diff --cc wcfsetup/install/files/acp/templates/articleAdd.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/box/AbstractDatabaseObjectListBoxController.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
Simple merge

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

diff --cc wcfsetup/install/lang/de.xml
Simple merge