Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 25 Aug 2016 22:19:07 +0000 (18:19 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 25 Aug 2016 22:19:07 +0000 (18:19 -0400)

Trivial merge