Merge branch 'master' into '2.6.1-dev'

# Conflicts:
#   Readme.md
1 job from 2.6.1-dev in 0 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:06:32