Tried to catch illegal remove exceptions in order to track down the cause of inconsistencies when deleting text while someone else is writing.
Merge remote-tracking branch 'origin/master'