Merge branch '3.6.1-dev'

1 job for 3.7.1-dev in 0 seconds (queued for 8 seconds)