complete 'form HTML.'
Merge remote-tracking branch 'upstream/master'