Merge branch 'master' of https://github.com/geekwright/XoopsCore
Merge branch 'master' of https://github.com/XOOPS/XoopsCore