stash
Merge branch 'master' into cancel-crawl
Allow crawl to be cancelled