Merge branch 'curls' into curl-out-reason