Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 7 Dec 2016 19:49:07 +0000 (14:49 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 7 Dec 2016 19:49:07 +0000 (14:49 -0500)

Trivial merge