Merge branch 'release-6.0.2'
encoding mt:ErrorMessage in comment_response tmpl bugid 111513
Bump up version number. bugid:111582
Merge branch 'internal-hotfix-1.42' into develop