Merge pull request #772 from rustyswayne/1.3.0

Patches issues associated with deserializing shipments from extended data