Merge branch 'hotfix/v7.16'

rowers/views.py

@@ -918,7 +918,7 @@ def hasplannedsessions(user):
 
         result = user.is_authenticated() and (r.rowerplan=='coach' or r.rowerplan=='plan')
         if not result and r.plantrialexpires:
-            result = user.is_authenticaded() and r.rowerplan=='basic' and r.plantrialexpires >= datetime.date.today()
+            result = user.is_authenticated() and r.rowerplan=='basic' and r.plantrialexpires >= datetime.date.today()
     else:
         result = False
 
@@ -11333,7 +11333,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 
     work = int(normw)
     power = int(normp)
-    pace_secs = int(500./normv)
+    try:
+        pace_secs = int(500./normv)
+    except (OverflowError, ZeroDivisionError):
+        pace_secs = 140.
 
     try:
         avpace = datetime.timedelta(seconds=int(500./normv))