Merge pull request #1 from XOOPS/master

Merge fork from main branch