Fix for mime-types
Merge branch 'r3_upgrade' of https://github.com/suegrimes/ISCC_LIMS.git into r3_upgrade