Merge pull request #1343 from sjpadgett/cancel-#1340