Merge branch 'master' into '3.6.1-dev'

# Conflicts:
#   Readme.md
1 job for 3.6.1-dev in 0 seconds (queued for 8 seconds)