Merge pull request #262 from gschlager/phpbb3