Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Fri, 17 Oct 2014 07:27:02 +0000 (09:27 +0200)
committerDavid Bremner <david@tethera.net>
Fri, 17 Oct 2014 07:27:02 +0000 (09:27 +0200)

Trivial merge