Merge pull request #8678 from eileenmcnaughton/paypalstd