Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Wed, 10 Feb 2016 02:11:25 +0000 (22:11 -0400)
committerDavid Bremner <david@tethera.net>
Wed, 10 Feb 2016 02:11:25 +0000 (22:11 -0400)

Trivial merge