Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Mon, 19 Jan 2015 06:28:25 +0000 (07:28 +0100)
committerDavid Bremner <david@tethera.net>
Mon, 19 Jan 2015 06:28:25 +0000 (07:28 +0100)

Trivial merge