Merge branch 'Fabii547-patch-17' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 1 Jun 2016 16:10:33 +0000 (18:10 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 1 Jun 2016 16:10:33 +0000 (18:10 +0200)

Trivial merge