Merge branch 'sprit'
authorJoey Schulze <joey@infodrom.org>
Thu, 21 Jul 2016 17:22:13 +0000 (19:22 +0200)
committerJoey Schulze <joey@infodrom.org>
Thu, 21 Jul 2016 17:22:13 +0000 (19:22 +0200)

Trivial merge