Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 30 Jun 2016 12:56:54 +0000 (14:56 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 30 Jun 2016 12:56:54 +0000 (14:56 +0200)

Trivial merge