Wrapped directory decorator in a try/finally
Merge branch 'django-email' into integration