Merge branch 'master', remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Moves the translation strings for the Feedback page from the Comments to the Feedback translation file
Fixes CS-4599; Feedback page has bogus localization file
Merge pull request #265 from terwey/CS-4599

Cs 4599