Merge branch 'v4.x-master' into 'v5.x-master'

Progress on v4 due to updates for the CLARIAH-DE Tutorial Finder

See merge request !55
1 job for v5.x-master in 46 seconds (queued for 1 second)