Use unified repos, not old split ones
Merge branch 'maint/4.0/testing'
s/4.0/devel/