[Stable] Update before closing

JDSU is coming to a close. In the wraps.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shipper.h
	shipper.csv