Fixing more shipto issues
Merge pull request #278 from einhverfr/1.3

Fixing more shipto issues