Marking entities about to be removed, avoiding multiple removal
Merge pull request #102 from Lusito/scheduled_for_removal

Marking entities about to be removed, avoiding multiple removal