Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 6 Oct 2016 15:12:57 +0000 (11:12 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 6 Oct 2016 15:12:57 +0000 (11:12 -0400)

Trivial merge