Load sport configuration
Load sport configuration
Change elapsed time waiver dates
Merge remote-tracking branch 'upstream/master'