Merge branch 'master' into stable
authork054 <k@fsf.org>
Fri, 18 Mar 2016 22:51:24 +0000 (18:51 -0400)
committerk054 <k@fsf.org>
Fri, 18 Mar 2016 22:51:24 +0000 (18:51 -0400)

Trivial merge