Merge branch 'master' into 'dev-jump-forecast-days-226'

# Conflicts:
#   tests/test_forecast.py
in 1 minute and 42 seconds, using 0 compute credits, and was queued for 1 second