Merge "Fix for multi-language support." into devel/master