Merge branch 'hotfix/2.1.4'
Sync with authbucket/oauth2 2.1.8.
Merge branch 'hotfix/2.1.5' into develop