Merge change 686 into donut

* changes:
  gps: Don't crash if no XTRA servers are specified.