Merge branch 'master' into updates
Update Docblocks, removing @package, correct phpBB copyright, & more.