Switch to curl for loading from local files
Update for 4.4.2_r3