Merge "DO NOT MERGE Fix French locale % escaping" into pi-dev