Maintain whitespace before tag close (#822)

Maintain whitespace before tag close (#822) #1949