Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Tue, 9 Jun 2015 17:38:56 +0000 (19:38 +0200)
committerDavid Bremner <david@tethera.net>
Tue, 9 Jun 2015 17:38:56 +0000 (19:38 +0200)

Trivial merge