Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 19:49:34 +0000 (15:49 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 19:49:34 +0000 (15:49 -0400)

Trivial merge