language finalFix
Merge branch 'vidar2'