Merge branch 'hotfix/issue-35'
Merge branch 'release/3.1'
Fix "unexpected keyword argument 'format'" when exporting from the admin.

Should be "file_type" not "format".
Upped version.
Merge branch 'hotfix/pr42' into develop