Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Mon, 6 Oct 2014 06:23:00 +0000 (08:23 +0200)
committerDavid Bremner <david@tethera.net>
Mon, 6 Oct 2014 06:23:00 +0000 (08:23 +0200)

Trivial merge