Update source language file
WIP: multi-tenancy
Merge branch '2.1'