Merge pull request #1341 from reciprocity/feature/fix-double-delete-error

Avoid error when clicking `delete` repeatedly
Merge branch 'release/0.9a28' into develop