Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Wed, 29 Oct 2014 21:00:35 +0000 (22:00 +0100)
committerDavid Bremner <david@tethera.net>
Wed, 29 Oct 2014 21:00:35 +0000 (22:00 +0100)

Trivial merge