fix #2639: NPE in GPX parser
Merge remote-tracking branch 'origin/release'