..
don't check access_token if not necessary
Merge remote-tracking branch 'origin/master'