Merge branch 'master', remote-tracking branch 'xoops123/master'