Fix notice on non-form item saves.
Merge branch 'master' into eb3