Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a' * commit 'd451b872babde2f97da08ba27d60e18643b76f0a': deal with gps renaming
This commit is contained in:
Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a' * commit 'd451b872babde2f97da08ba27d60e18643b76f0a': deal with gps renaming