Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 2 Sep 2016 14:45:37 +0000 (10:45 -0400)
committerZak Rogoff <zak@fsf.org>
Fri, 2 Sep 2016 14:45:37 +0000 (10:45 -0400)

Trivial merge