From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 30 May 2016 16:44:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~1567
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc486ed8116444b189d4ed1276049a572bf3417b;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next' into next
---

cc486ed8116444b189d4ed1276049a572bf3417b