Merge 3.3.x into master#76

iMattPro merged 2 commits into

masterphpbb-extensions/test-framework:masterfrom

3.3.xphpbb-extensions/test-framework:3.3.xCopy head branch name to clipboard