Merge "Upgrade wikimedia/remex-html to 2.0.0" into REL1_31