Merge pull request #5765 from etracer65/gps_speed_units