Merge 'jaimeMF/videoconversion' (sans actual option for now)