Merge branch '2.1'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 24 Jan 2017 14:20:53 +0000 (15:20 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 24 Jan 2017 14:20:53 +0000 (15:20 +0100)

Trivial merge