Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 8 Dec 2016 16:46:10 +0000 (11:46 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 8 Dec 2016 16:46:10 +0000 (11:46 -0500)

Trivial merge