Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:00:36 +0000 (18:00 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:00:36 +0000 (18:00 -0500)

Trivial merge