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

Trivial merge