Merge branch 'master' of https://github.com/joostdekeijzer/mw-oauth2-client-extension
Merge branch 'master' of https://github.com/joostdekeijzer/mw-oauth2-client-extension