Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle

diff --cc grade/tests/behat/grade_natural_normalisation.feature
index 94f1cf3,c1d325a..860a7b0
--- 1/grade/tests/behat/grade_natural_normalisation.feature
--- 2/grade/tests/behat/grade_natural_normalisation.feature
+++ b/grade/tests/behat/grade_natural_normalisation.feature
@@@ -255,5 -263,14 +255,14 @@@ Feature: We can use natural aggregatio
    And I set the field "Override weight of Test assignment six" to "1"
    And I set the field "Weight of Test assignment six" to "-25"
    And I press "Save changes"
-   Then the field "Weight of Test assignment six" matches value "0.0"
+   And the field "Weight of Test assignment six" matches value "0.0"
    And the field "Weight of Test assignment seven" matches value "100.0"
 -  And the field "Weight of Test assignment seven" matches value "0.0"
+   And I follow "Reset weights of Sub category 1"
+   And I set the field "Override weight of Test assignment five" to "1"
+   And I set the field "Override weight of Test assignment six" to "1"
+   And I set the field "Weight of Test assignment five" to "-10"
+   And I set the field "Weight of Test assignment six" to "120"
+   And I press "Save changes"
+   And the field "Weight of Test assignment five" matches value "0.0"
+   And the field "Weight of Test assignment six" matches value "100.0"
++  And the field "Weight of Test assignment seven" matches value "0.0"

diff --cc lib/grade/grade_category.php
Simple merge