Merge remote-tracking branch 'lei/next' into next
Merge branch 'next' of github.com:jeanparpaillon/erocci into next
Allow test sctipts to use a CURL_OPTS env var