Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle

Conflicts:
	admin/oacleanup.php

diff --cc lib/accesslib.php
Simple merge

diff --cc lib/blocklib.php
Simple merge

diff --cc lib/enrollib.php
Simple merge

diff --cc lib/navigationlib.php
Simple merge

diff --cc lib/tests/accesslib_test.php
Simple merge

diff --cc lib/upgrade.txt
Simple merge

diff --cc rating/lib.php
Simple merge

diff --cc user/externallib.php
Simple merge