Merge "Fix doc-blocks for some HTMLForm elements"