Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Mon, 8 Feb 2016 11:57:57 +0000 (07:57 -0400)
committerDavid Bremner <david@tethera.net>
Mon, 8 Feb 2016 11:57:57 +0000 (07:57 -0400)

Trivial merge