merge w/ celery_tweaks, updating affected subs