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

Trivial merge