Merge branch 'master' into stable
authork054 <k@fsf.org>
Fri, 18 Mar 2016 23:02:49 +0000 (19:02 -0400)
committerk054 <k@fsf.org>
Fri, 18 Mar 2016 23:02:49 +0000 (19:02 -0400)

Trivial merge