Merge branch 'master' of https://github.com/bshaffer/oauth2-server-bundle