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

Trivial merge