Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle

diff --cc admin/tool/uploaduser/index.php
Simple merge

diff --cc backup/util/progress/core_backup_progress.class.php
Simple merge

diff --cc blocks/rss_client/block_rss_client.php
Simple merge

diff --cc course/tests/courselib_test.php
Simple merge

diff --cc lang/en/admin.php
Simple merge

diff --cc lib/badgeslib.php
Simple merge

diff --cc lib/classes/session/manager.php
Simple merge

diff --cc lib/filelib.php
Simple merge

diff --cc lib/modinfolib.php
Simple merge

diff --cc lib/upgradelib.php
Simple merge

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

diff --cc mod/quiz/report/overview/report.php
Simple merge

diff --cc question/classes/statistics/questions/calculator.php
Simple merge