Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle

diff --cc lib/weblib.php
Simple merge

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

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