Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Sep 2016 21:49:40 +0000 (17:49 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Sep 2016 21:49:40 +0000 (17:49 -0400)

Trivial merge