Fixed issue with form dialog
Merge remote-tracking branch 'upstream/master'
Merge pull request #272 from jerv13/master

Fixed issue with form dialog