Merge branch 'master' of https://github.com/seyon/PHPBB3AdminBundle.git