Merge branch 'email' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 1 Aug 2016 14:40:44 +0000 (16:40 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 1 Aug 2016 14:40:44 +0000 (16:40 +0200)

Trivial merge