Merge branch '2.0' into 2.1
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 31 May 2017 14:10:15 +0000 (16:10 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 31 May 2017 14:10:15 +0000 (16:10 +0200)

Trivial merge