Athletics News and Fixes
Merge branch 'Aug-7-1447'