Use standard 'access_token' instead of 'oauth_token'
Merge branch 'master' into wip-gv-integration