Merge pull request #2022 from wind0r/reenbable_gps