Fixes for saving shipto information

--HG--
extra : source : 9f3bf3a85d67b770aac5ce5228ca3d8b3f472ea4
Changelog entry

--HG--
extra : source : b3c7b192149d58de4e740f556063c3f06fe71b7b
Merge pull request #199 from einhverfr/master

merging shipto fix from 1.3