Merge commit '02c1c46fff22490f884f05520d58eadae1442db8' * commit '02c1c46fff22490f884f05520d58eadae1442db8': gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
Merge commit '02c1c46fff22490f884f05520d58eadae1442db8' * commit '02c1c46fff22490f884f05520d58eadae1442db8': gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.