Merge pull request #8182 from jefferyto/gpsd-init