Merge branch 'develop-time_unit_condition' into 'master'

Develop time unit condition

See merge request !176
1 job for master
in 75 minutes and 41 seconds, using 0 compute credits, and was queued for 3 seconds