Replaced physical files with memory files (StringIO).
Merge branch 'stringio' into develop