#78: GPX version inconsistency
Merge remote-tracking branch 'christian-m/78_gpx_version_inconsistency'; update #78
Merge branch 'master' into next
Merge branch 'master' into next
fixed db mutation 110 (converting adoption history)