Merged modifications on Brick\Paypal from SVN