Merge pull request #505 from rustyswayne/master

Patches breaking Ship Fulfillment for uWestFest demo.