Merge pull request #2947 from baruchsiach/fix-build-gpsd