Merge branch 'master' into next

author Matthias Schmidt <gravatronics@live.com>

Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)

committer Matthias Schmidt <gravatronics@live.com>

Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
author Matthias Schmidt <gravatronics@live.com>
Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
committer Matthias Schmidt <gravatronics@live.com>
Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
diff --cc com.woltlab.wcf/option.xml
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Media/Upload.js
Simple merge
diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Matthias Schmidt <gravatronics@live.com>
	Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
committer	Matthias Schmidt <gravatronics@live.com>
	Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
		1	2
com.woltlab.wcf/option.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Upload.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/WCF.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history