Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 20:41:57 +0000 (15:41 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 20:41:57 +0000 (15:41 -0500)

Trivial merge