Merge "clear cache when locale is changed" into devel/master