Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Thu, 14 Jan 2016 18:19:43 +0000 (14:19 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 14 Jan 2016 18:19:43 +0000 (14:19 -0400)

Trivial merge