Merge branch 'new-password' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 29 Jul 2016 21:21:14 +0000 (23:21 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 29 Jul 2016 21:21:14 +0000 (23:21 +0200)

Trivial merge