Fix the weird formatting caused by copying from MS Word
Fix release/main.js now that formatting in values.js is fixed
Merge branch '3.21'