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

Trivial merge