Merge tag 'v5.25' into develop

hotfix

rowers/views.py

@@ -7537,6 +7537,12 @@ def workout_flexchart3_view(request,*args,**kwargs):
 
     extrametrics = {m.replace('/','_slsh_'):m for m in additionalmetrics}
 
+    xparam = xparam.replace('/','_slsh_')
+    yparam1 = yparam1.replace('/','_slsh_')
+    yparam2 = yparam2.replace('/','_slsh_')
+
+    print xparam,yparam1,yparam2,'aap'
+    
     try:
         extrametrics.pop('originalvelo')
     except KeyError: