Move in_directory decorator to FileSystem class
Merge branch 'django-email' into integration