Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Sat, 12 Mar 2016 01:18:36 +0000 (20:18 -0500)
committerZak Rogoff <zak@fsf.org>
Sat, 12 Mar 2016 01:18:36 +0000 (20:18 -0500)

Trivial merge