Tpb fix provider url
Merge remote-tracking branch 'upstream/Pistachitos' into Pistachitos