Really cleans-up the temp directory if it has been created by a previous worker
Merge branch 'version/1.9' into version/2.0

* version/1.9:
  Really cleans-up the temp directory if it has been created by a previous worker