Merge branch 'master' into '2.6.1-dev'

# Conflicts:
#   Readme.md
1 job for 2.6.1-dev
in 0 seconds, using 0 compute credits, and was queued for 8 seconds