Fixes: U4-4537 Macro Textbox parameter in RTE Encoding issue
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0