Trying to prevent extra celery tasks from spawning.
Merge remote-tracking branch 'origin/master' into ansible-dmi