Fix for broken getAffiliateByEmail() method
Shipping model updates