Merge branch 'sim_dev' into 'master'

EESimulator Time bug-fix

See merge request !36
1 job for master in 1 minute and 11 seconds (queued for 1 second)
Status Job ID Name Coverage
  Linux
passed #1248270
MasterJobLinux

00:01:11