Merge pull request #3954 from colemanw/forms