Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 19 Jan 2016 22:28:54 +0000 (17:28 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 19 Jan 2016 22:28:54 +0000 (17:28 -0500)

Trivial merge