Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle

diff --cc mod/assign/lang/en/assign.php
Simple merge

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

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