repair event condition is now the same as recover event condition,
allows for reference to event etc. in model.
Merge remote-tracking branch 'origin/develop' into develop