Merge tag 'v5.68' into develop

bug fixes

rowers/templates/rankings.html

@@ -280,7 +280,7 @@
 </div>
 
 <div class="grid_6 alpha">
-  {% if age %}
+  {% if age and sex != 'not specified' %}
   <h1>World Records</h1>
   <table width = "70%" class="listtable">
     <tbody>
@@ -377,6 +377,10 @@
       </tr>
     </tbody>
   </table>
+  {% else %}
+  If you fill in your birth date and gender, you will see World Records for
+  your age group and gender at this place. You can edit your settings
+  <a href="/rowers/me/edit">here</a>.
 {% endif %}
 </div>
 </div>