Merge branch '68-non-expiring' into '2.1-dev'

Resolve "Special Schedules that do not expire"

See merge request !29
3 jobs for 62-friendly-names in 1 minute and 34 seconds (queued for 3 seconds)