Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 20:32:01 +0000 (15:32 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 20:32:01 +0000 (15:32 -0500)

Trivial merge