Support access_token query parameter
Merge remote-tracking branch 'origin/master'