OAuth2.0 support for "state" parameter
Merge branch 'master_squash'