Merge branch 'normalise-markup-by-default' into develop