MDL-40896 Add missing question edit CSS to bootstrapbase.
MDL-41093 qtype match: unique index upgrade problem.

Eliminate duplicate rows before we try to add a unique index. We
arbitrarily keep the duplicate row with the lowest id.
MDL-36789 Quick course cache integrity check for deleted modules
MDL-37393 SCORM: Fix existing AICC scoes to use correct parent/child relationships

also fix bad version used by patch in MDL-39239
MDL-37393 SCORM: Fixed PHP Strict Standards errors with AICC packages
MDL-39572: Fix existing tests and add more to demonstrate issue with sql_order_by_text()
MDL-39572: Fix sql_order_by_text() to use length argument correctly
MDL-41106 cache: several fixes for the session cache.

This issue makes several fixes for the session loader and the session store.
* maxsize argument now works for session caches.
* fixed performance hole when interation occurs frequently.
* fixed cache purge bug occuring when multiple caches are defined before being used.
* improved lastaccess handling.
MDL-40893 backup: cache question answers for performance

To constrain memory we only cache a single question's answers.
A quiz must display this many answers, so it will not result
in undue memory pressure.

We now match on the full answer text rather than the first 255
characters.  This removes the risk of matching questions with the
same start.
MDL-39703 Roles, Themes: Fix "Add role" dialog width and position, in RTL mode (theme/clean)
MDL-41106 Cleaning up expired elements in session cache store

- Always make sure the elements in cache are sorted so we need to remove only elements in the beginning of array
- Remove expired elements from session store to free memory
- Minor bug fixes
MDL-41106 cache: tidied up several elements
MDL-30839 Accessibility, Forms - Improve accessibility or error messages
Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle
Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle
Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle
Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle
Revert "MDL-41106 cache: several fixes for the session cache."

This reverts commit 89182546a0ae93a2aef79383bac902c77c7801f8.
This reverts commit 170b05362a82b2c1f5353551b7bd6fe4246fe951.
This reverts commit 2e9d5a534e8e3045923055baa1609d66cec0affe.
Merge branch 'MDL-40896' of git://github.com/timhunt/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css