Merge "Correct two mistaken htmlform annotations"