Merge branch 'hotfix/2.2.4' into develop
Sync with oauth2-php 2.3.0.
Merge branch 'release/2.3.0'