Merge pull request #935 from rustyswayne/1.5.0

Updates ShipmentDisplay with new shipment status properties.