Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Mon, 23 Feb 2015 22:52:09 +0000 (17:52 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Mon, 23 Feb 2015 22:52:09 +0000 (17:52 -0500)

Trivial merge