Merge "HTMLForm: Add comment to help grepping function names"