Do not use kill -9
Merge pull request #919 from JamesGlover/imporve_delayed_job_script

Do not use kill -9
Resolve merge conflicts