fix variable name
fix incorrect sanitation of array variables
Merge remote-tracking branch 'upstream/master' into fix/form/question-remove
Merge pull request #1595 from ojalehto/fix/form/question-remove

Fix errors on form questions remove