Merge pull request #1 from XOOPS/master

Merge fork from main branch
Merge pull request #117 from redheadedrod/master

Merge pull request #1 from XOOPS/master
Merge remote-tracking branch 'upstream/master'