Merge branch 'maint'master
authorRasmus <rasmus@gmx.us>
Sun, 30 Aug 2015 07:41:40 +0000 (30 09:41 +0200)
committerRasmus <rasmus@gmx.us>
Sun, 30 Aug 2015 07:41:40 +0000 (30 09:41 +0200)

Trivial merge