Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Thu, 24 Dec 2015 11:02:28 +0000 (12:02 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 24 Dec 2015 11:02:28 +0000 (12:02 +0100)

Trivial merge