Fixes the scan upload form.
Merge branch '2.1' into qa