Merge branch '2.0' into 2.1
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 7 Jun 2017 17:42:09 +0000 (19:42 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 7 Jun 2017 17:42:09 +0000 (19:42 +0200)

Trivial merge