Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 15 Mar 2016 21:15:36 +0000 (17:15 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 15 Mar 2016 21:15:36 +0000 (17:15 -0400)

Trivial merge