Add auto-clean to deploy task. Fixes #1512.
Merge remote-tracking branch 'upstream/master'