Merge branch 'refs/heads/Fabii547-userprofilemenuitems' into next
authorMarcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 15:08:50 +0000 (17:08 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 15:08:50 +0000 (17:08 +0200)

Trivial merge