Groundwork for form helpers
Merge remote-tracking branch 'origin/master'