Fulfill shipment dialog edits.
Merge pull request #938 from cssquirrel/1.5.0

Fulfill shipment dialog edits.