Merge branch 'master' into stable
authork054 <k@fsf.org>
Sat, 19 Mar 2016 12:53:11 +0000 (08:53 -0400)
committerk054 <k@fsf.org>
Sat, 19 Mar 2016 12:53:11 +0000 (08:53 -0400)

Trivial merge