Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 18 Feb 2015 22:10:16 +0000 (17:10 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 18 Feb 2015 22:10:16 +0000 (17:10 -0500)

Trivial merge