Fixed plot distance for activities merged from multiple fit files
Merge remote-tracking branch 'origin/master'