Merge pull request #46 from ledgersmb/1.4

1.4
fixing shipto's not being autochecked

--HG--
extra : source : 2474dfa86f7b808665e654b5441bb30714b95a3b
Merge pull request #201 from einhverfr/1.4

Grafting in 1.3 fixes