Merge remote-tracking branch 'origin/master' into mmosca-ublox-satinfo