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

Trivial merge