merge from other forks, update oauth2 to the latest version