Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Mon, 14 Dec 2015 23:58:17 +0000 (19:58 -0400)
committerDavid Bremner <david@tethera.net>
Mon, 14 Dec 2015 23:58:17 +0000 (19:58 -0400)

Trivial merge