Fixes: U4-4853 Richtext Editor doesn't render macros after upgrade to Umbraco 6.2.0
Merge remote-tracking branch 'origin/6.2.1' into 7.1.3