Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Fri, 31 Oct 2014 06:50:55 +0000 (07:50 +0100)
committerDavid Bremner <david@tethera.net>
Fri, 31 Oct 2014 06:50:55 +0000 (07:50 +0100)

Trivial merge