Minor things, I guess..
Merge commit 'origin/master'

Conflicts:

	shipment_tracking_utility.rb