Merge latest code from previous release

Warning message

This form is a demo and may not be submitted by anyone other than the creator of the form.
What is 4 + 3?
:
Files must be less than 2 MB.
Allowed file types: gif jpg png.
New fieldset