Merge branch 'MDL-25981'

diff --cc course/lib.php
Simple merge

diff --cc lib/moodlelib.php
Simple merge

diff --cc lib/navigationlib.php
Simple merge

diff --cc lib/weblib.php
Simple merge

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