ImageUpload has been modified to support the edit form. The plugin uses
the same form used by "Insert/Edit Image" button
Merge remote-tracking branch 'origin/master'