fix broken type= reference when saving self-used language from MergeDriver
Merge branch 'mvtest30'