Merge remote-tracking branch 'stapelberg/mimetype'