Merge branch 'master' into tasks
celery application context fixes
Merge branch 'tasks'