MDL-38315 Completion: Bugs with 'locked' status in activity form
MDL-37966 Assignment: put upgraded modules where the originals were
MDL-38361: Fixed typos in mod/assign/locallib.php
MDL-38480_m24 Fix for messy usage of language strings in block course overview
MDL-39084 grade: Capability checks are incoherent for the Course grade settings section
MDL-39135 assign_feedback: fix missing renderer argument

assign_user_summary expects extra profile fields

Conflicts:

	mod/assign/feedback/file/locallib.php
MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning
MDL-39167 quiz access rules: need to validate their settings.

We were missing the hook in the form validation method. We had them
everywhere else they were needed.
MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility
MDL-39172 Import of .dat files is broken in blackboard_six import format
MDL-39141 fix customtoolbar notices during upgrade
MDL-38565 cache: session caches now function as expected

This change is a large change to the way sessions are handled
within MUC after it was discovered that session did not function
as expected when any store other than the default session store
was being used.
As part of this change the session loader has been largely
customised in order to consolidate session data for the loader.
The unit tests have also being greatly increased to provide
better coverage for sessions.

Conflicts:
	cache/README.md
	cache/tests/cache_test.php
MDL-38565 cache: cron routine to clean up old session data
MDL-38565 cache: upgrade code to amend default stores

Conflicts:
	version.php
MDL-38565 cache: improve stats gathering
MDL-38565 cache: tidy up pre-integration

Conflicts:
	lib/db/upgrade.php
Merge branch 'MDL-39135-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
Merge branch 'MDL-39185_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
MDL-30940 form: Mutiple select work correctly without any selection
Merge branch 'MDL-39167_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE