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

Trivial merge