Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Mon, 14 Dec 2015 20:30:35 +0000 (16:30 -0400)
committerDavid Bremner <david@tethera.net>
Mon, 14 Dec 2015 20:30:35 +0000 (16:30 -0400)

Trivial merge