Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 16:59:33 +0000 (12:59 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 16:59:33 +0000 (12:59 -0400)

Trivial merge