Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle

diff --cc lib/testing/generator/data_generator.php
Simple merge

diff --cc mod/assign/gradingoptionsform.php
Simple merge

diff --cc mod/assign/gradingtable.php
Simple merge

diff --cc mod/assign/locallib.php
Simple merge

diff --cc mod/assign/tests/locallib_test.php
Simple merge