#508 Replace PUN_*, update language
Merge branch 'version2.2'
Merge branch 'master' into version3.0