Merge 3.3.x into Master#57

iMattPro merged 3 commits intophpbb-extensions:masterphpbb-extensions/test-framework:masterfrom

iMattPro:master-updateiMattPro/test-framework:master-updateCopy head branch name to clipboard