Merge branch 'master' into develop
authorMart Lubbers <mart@martlubbers.net>
Wed, 2 Jul 2014 10:11:13 +0000 (12:11 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 2 Jul 2014 10:11:13 +0000 (12:11 +0200)

Trivial merge