Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 21 Apr 2016 20:59:20 +0000 (16:59 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 21 Apr 2016 20:59:20 +0000 (16:59 -0400)

Trivial merge