Merge remote-tracking branch 'refs/remotes/WoltLab/next-lantia' into next-lantia
authorFabii <fabiangossner@gmail.com>
Fri, 22 Jan 2016 15:46:15 +0000 (16:46 +0100)
committerFabii <fabiangossner@gmail.com>
Fri, 22 Jan 2016 15:46:15 +0000 (16:46 +0100)

Trivial merge