Merge "Update dictionaries (possibly_offensive flag)"