Merge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle