Merge branch 'master' of https://github.com/willdurand/BazingaOAuthServerBundle into patch-5