Replace Competition#dnf? with Competition#dnf_points
Merge master