Merge new filetypes back into upstream