Merge branch 'release/2.0.4' into develop
Fixed oauth_session_token_scopes primary key
Removed `DEFAULT ''` that has slipped in
Fixed docblock
Changelog update
Version bump
mErge branch 'release/2.0.5'