Merge branch 'MDL-58504_master' of git://github.com/markn86/moodle

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

diff --cc mod/book/lib.php
Simple merge

diff --cc mod/feedback/lib.php
Simple merge

diff --cc mod/scorm/lib.php
Simple merge