Collaboration L10N fixes
Merge branch 'origin/5.x'