Some fixes to make phpBB Handling stuff more usable
Merge branch 'master' into develop