Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Tue, 9 Feb 2016 12:26:42 +0000 (08:26 -0400)
committerDavid Bremner <david@tethera.net>
Tue, 9 Feb 2016 12:26:42 +0000 (08:26 -0400)

Trivial merge