Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 12 Dec 2016 20:49:28 +0000 (15:49 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 12 Dec 2016 20:49:28 +0000 (15:49 -0500)

Trivial merge