Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle

diff --cc course/externallib.php
Simple merge

diff --cc lib/filestorage/stored_file.php
Simple merge

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

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

diff --cc mod/forum/tests/externallib_test.php
Simple merge

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

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

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