Merge 'removes-webmock' to 'master' branch