Fix wrong merge

Fixes #683.
Merge github.com:hwi/HWIOAuthBundle