Merge branch '2.1'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 17 Jun 2017 18:42:39 +0000 (20:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 17 Jun 2017 18:42:39 +0000 (20:42 +0200)

Trivial merge