Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 18 Dec 2015 21:48:03 +0000 (16:48 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 18 Dec 2015 21:48:03 +0000 (16:48 -0500)

Trivial merge