[GAIA BUG946750-FORM] - untrashing the patch from debug code
Merge pull request #348 from michalbe/Bug946750-form-temp

[GAIA BUG946750-FORM] - untrashing the patch from debug code