Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Tue, 9 Feb 2016 00:19:51 +0000 (20:19 -0400)
committerDavid Bremner <david@tethera.net>
Tue, 9 Feb 2016 00:19:51 +0000 (20:19 -0400)

Trivial merge