Merge branch 'sim_dev' into 'master'

EESimulator Time bug-fix

See merge request !36
1 job for dev_ema in 1 minute and 6 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Linux
passed #1308174
BranchJobLinux

00:01:06