Merge branch 'background' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 23 Jun 2015 22:31:31 +0000 (00:31 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 23 Jun 2015 22:31:31 +0000 (00:31 +0200)

Trivial merge