Merge branch 'release-1.3.6'

1 job for 1.3.6 in 12 seconds (queued for 41 seconds)