Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 21:58:43 +0000 (16:58 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 21:58:43 +0000 (16:58 -0500)

Trivial merge