Merge pull request #1017 from rustyswayne/1.6.1

Shipment editing continued