Merge remote-tracking branch 'origin/stable'
authork054 <k@fsf.org>
Tue, 15 Mar 2016 22:20:17 +0000 (18:20 -0400)
committerk054 <k@fsf.org>
Tue, 15 Mar 2016 22:20:17 +0000 (18:20 -0400)

Trivial merge