Sync gpx-util with upstream/master.