Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 21 Dec 2015 20:58:33 +0000 (15:58 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 21 Dec 2015 20:58:33 +0000 (15:58 -0500)

Trivial merge