Performance patch
Merge pull request #675 from Cataclysm/publichd-provider-performance-patch

Performance patch for PublicHD provider