Merge branch 'jc/curl'