MDL-30144 Assignmnet 2.2: fixed context retrival
Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle
MDL-35823 - Accessibility - Follow up changes from the original commit: addint in theme fixes and updating upgrade.txt
Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle
MDL-35823 - Accessibility - Readding Focus to header in the help popup
Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle
MDL-37572 - fix typo in has_any_capability()
MDL-37566 AJAX Fix issues with minimum height and centring
MDL-37572 course: fixed bug when moving categories
Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle
MDL-37572 small bug fix with misplaced assignment
MDL-37572 correct active navigation node for add/edit category page
MDL-37122 core get_max_upload_sizes: Include "Course/Site/Activity limit (X)" in list of options

This change removes the "0 bytes" option from the get_max_upload_sizes list
and replaces it with "Course limit (X)" or "Site limit (X)" (whichever is smaller).
This means we can remove all custom handling in the modules that were removing and
adding these options. It only affects pages that pass valid options for sitelimit and
courselimit - so admin pages will work correctly.

It also orders the list so the course/site limit options will be first
(as it will be the largest).

AMOS START
 REM [courseuploadlimit, core] has been parameterized to get [uploadlimitwithsize, core]
AMOS END