Merge remote-tracking branch 'origin/next' into next
authorMarcel Werk <burntime@woltlab.com>
Thu, 26 May 2016 10:20:40 +0000 (12:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 26 May 2016 10:20:40 +0000 (12:20 +0200)
# Conflicts:

# wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php


Trivial merge