Merge pull request #6927 from eileenmcnaughton/CRM-17256-paypal