Merge branch 'master' into gen
authorMart Lubbers <mart@martlubbers.net>
Fri, 13 May 2016 16:35:20 +0000 (18:35 +0200)
committerMart Lubbers <mart@martlubbers.net>
Fri, 13 May 2016 16:35:20 +0000 (18:35 +0200)

Trivial merge