Use non-minified version of curl so it works with plugins
Merge remote-tracking branch 'origin/master'