Forgot to import F class

Missed by unit tests because we skip certain tests due to celery issues
Merge branch 'master' into deploy