Merge branch '3.6.1-dev' into 'master'

3.6.1 dev

See merge request !19
1 job for 32-bugzilla-bug-270-sol005_def-yaml-datetime-missing-type-string
in 0 seconds, using 0 compute credits, and was queued for 7 seconds