sync Eugene gpx additions to master