Merge "Require strip marker names to not have & ' " < or > in them"