Merge branch 'master' into next

author Alexander Ebert <ebert@woltlab.com>

Sat, 16 Feb 2019 18:02:06 +0000 (19:02 +0100)

committer Alexander Ebert <ebert@woltlab.com>

Sat, 16 Feb 2019 18:02:06 +0000 (19:02 +0100)
author Alexander Ebert <ebert@woltlab.com>
Sat, 16 Feb 2019 18:02:06 +0000 (19:02 +0100)
committer Alexander Ebert <ebert@woltlab.com>
Sat, 16 Feb 2019 18:02:06 +0000 (19:02 +0100)
diff --cc wcfsetup/install/files/js/WoltLabSuite.Core.min.js
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite.Core.tiny.min.js
Simple merge
diff --cc wcfsetup/install/files/lib/util/ImageUtil.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Sat, 16 Feb 2019 18:02:06 +0000 (19:02 +0100)
committer	Alexander Ebert <ebert@woltlab.com>
	Sat, 16 Feb 2019 18:02:06 +0000 (19:02 +0100)
		1	2
wcfsetup/install/files/js/WoltLabSuite.Core.min.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite.Core.tiny.min.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/util/ImageUtil.class.php	patch \|	diff1 \|	diff2 \|	blob \| history