Merge "(bug 37587) Enforce language codes to be html safe"