Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 26 Jul 2015 16:38:00 +0000 (18:38 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 26 Jul 2015 16:38:00 +0000 (18:38 +0200)

Trivial merge