Merge "Non-word characters shouldn't terminate tag names on the tidy side too"