Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 21:50:59 +0000 (16:50 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 21:50:59 +0000 (16:50 -0500)

Trivial merge