Fixes #300
Merge branch 'develop' into feature/context_sensitive_upload_partials