Merge branch 'master' into 'fix_combo'

# Conflicts:
#   CHANGELOG.md
2 jobs for fix_combo in 39 seconds (queued for 2 seconds)
latest