Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Sun, 14 Feb 2016 21:05:27 +0000 (17:05 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 14 Feb 2016 21:05:27 +0000 (17:05 -0400)

Trivial merge