Merge branch 'eventdefinitionm26_use_skip_time' into 'master'

Using skip_time in EventDefinitionM26

See merge request !415
21 jobs for master in 29 minutes and 2 seconds (queued for 8 seconds)