Fixing editing where edit targets aren't closed correctly for jobs.
Merge branch 'release-2.1'