Merge branch 'stable'
authorZak Rogoff <zak@fsf.org>
Wed, 11 Jan 2017 17:11:00 +0000 (12:11 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 11 Jan 2017 17:11:00 +0000 (12:11 -0500)

Trivial merge