Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Thu, 31 Dec 2015 17:39:53 +0000 (13:39 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 31 Dec 2015 17:39:53 +0000 (13:39 -0400)

Trivial merge