Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Thu, 7 Jan 2016 13:12:13 +0000 (09:12 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 7 Jan 2016 13:12:13 +0000 (09:12 -0400)

Trivial merge