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

Trivial merge