Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 4 Dec 2015 22:49:28 +0000 (17:49 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 4 Dec 2015 22:49:28 +0000 (17:49 -0500)

Trivial merge