MDL-33536 navigation: hide hidden categories from the navbar
MDL-42723: Hide and handle LDAP error when user not in context being checked

MDL-41304 only fixed the case when 'Search subcontext' is enabled. We need to
fix the case when it's not enabled too.

While silencing errors with an @ should be avoided if possible, there's no
other way to prevent the warnings in this case.
MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course
MDL-42795 course: fixed param course in sql

course_sections has course field and not courseid, hence replaced it with course.
MDL-42699 TinyMCE: adding padding to content area in Clean
MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()
MDL-42803 behat: Add a wait to fix possible random behat errors in CI
Merge branch 'wip-mdl-42795-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42803-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
MDL-42806 block_mentees: can only be docked if it has a valid title set.
Merge branch 'MDL-42043-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
NOBUG: convert tabs to whitespaces
MDL-38574 qtype chooser: quick fix to make it fit on-screen.

MDL-32729 will provide a better fix for this, but we may as well apply
this quick fix on stable branches.
MDL-40481 quiz responses report needs cols need text_sorting
MDL-42540 quiz manual grading should have setType
MDL-42598 quiz variant randomisation not random enough.

A student would get the same question variants (for example for a
calculated question) on their first attempt at both copies of a
duplicated quiz.
Merge branch 'MDL-40481_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
Merge branch 'MDL-41775_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE
Automatically generated installer lang files
Merge branch '42806-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE