defect/forms - Issue #56 (real)

Previous merge went haywire.