Stashed changes, caught up with Bob's local
Revert "Stashed changes, caught up with Bob's local"

This reverts commit 2dfad83acdd67fdd86114bae44e3383fa767bd25.
Merge branch '28_natural_weights_initial26merge' of https://github.com/MoodleGradebookWorkingGroup/moodle into 28_natural_weights_initial26merge