Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 26 May 2016 14:33:51 +0000 (10:33 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 26 May 2016 14:33:51 +0000 (10:33 -0400)

Trivial merge