Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 16:19:37 +0000 (12:19 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 16:19:37 +0000 (12:19 -0400)

Trivial merge