Merge 3.3.x into Master#282

iMattPro merged 2 commits intomasterphpbb/documentation:masterfrom

3.3.xphpbb/documentation:3.3.xCopy head branch name to clipboard