Merge branch 'develop-calendar-NULL' into 'master'

Avoid crash if calendar type doesn't exist

See merge request !191
1 job for master
in 44 minutes and 53 seconds, using 0 compute credits, and was queued for 3 seconds