Merge branch 'GPSd'