Merge pull request #1079 from esdrubal/webclient_cancel