Merge remote-tracking branch 'refs/remotes/origin/master' into next

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
	wcfsetup/install/files/js/WCF.Combined.min.js
	wcfsetup/install/files/lib/system/WCF.class.php

diff --cc wcfsetup/install/files/js/WCF.User.js
Simple merge

diff --cc wcfsetup/install/files/js/WCF.js
Simple merge

diff --cc wcfsetup/install/files/style/global.less
Simple merge

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