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

Trivial merge