final master
authorMart Lubbers <mart@martlubbers.net>
Wed, 27 Jan 2016 14:13:17 +0000 (15:13 +0100)
committerMart Lubbers <mart@martlubbers.net>
Wed, 27 Jan 2016 14:13:17 +0000 (15:13 +0100)

Trivial merge