Merge branch 'stable'
authorZak Rogoff <zak@montage.office.fsf.org>
Mon, 10 Nov 2014 22:25:38 +0000 (17:25 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Mon, 10 Nov 2014 22:25:38 +0000 (17:25 -0500)

Trivial merge