Merge pull request #6291 from s0up/gps_rescue