Merge from forks: Add GPS support

This finally fixes GPS.  (Yippee..!)