Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Wed, 20 May 2015 08:12:49 +0000 (10:12 +0200)
committerDavid Bremner <david@tethera.net>
Wed, 20 May 2015 08:12:49 +0000 (10:12 +0200)

Trivial merge