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

Trivial merge