Merge "Consistently use Html class for form generation"