Merge branch '2.1'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 7 May 2017 14:38:08 +0000 (16:38 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 7 May 2017 14:38:08 +0000 (16:38 +0200)

Trivial merge