Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 28 Jan 2016 22:43:44 +0000 (17:43 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 28 Jan 2016 22:43:44 +0000 (17:43 -0500)

Trivial merge