Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 28 Sep 2016 15:54:28 +0000 (11:54 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 28 Sep 2016 15:54:28 +0000 (11:54 -0400)

Trivial merge