Merge "Removed CURLOPT_FAILONERROR" into devel/master