Merge branch 'curl-update' into devel