[MERGE] Merge 6.1 except *.po's