Merge pull request #7294 from TonyBlit/gps_rescue_no_mag