Merge pull request #9588 from RussellSenior/update-gpsd