Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Fri, 8 Jan 2016 12:49:51 +0000 (08:49 -0400)
committerDavid Bremner <david@tethera.net>
Fri, 8 Jan 2016 12:49:51 +0000 (08:49 -0400)

Trivial merge