gps: Comment-only fix
Merge remote-tracking branch 'upstream/master'