Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 20 Apr 2016 17:12:50 +0000 (13:12 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 20 Apr 2016 17:12:50 +0000 (13:12 -0400)

Trivial merge