BUG: a fix toward 2.5 compatibility
BUG: a fix toward 2.5 compatibility

lesteve/joblib,karandesai-96/joblib,karandesai-96/joblib,aabadie/joblib,joblib/joblib,aabadie/joblib,lesteve/joblib,tomMoral/joblib,joblib/joblib,tomMoral/joblib