oauth_wrap changes from last merge