Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle
Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle
MDL-43975 Sessions: Should support memcache, not just memcached

This commit adds a session handler which works using memcache (without
requiring the memcached extension), similar to the support for
memcache within MUC.

This may be less reliable than memcached but we have been using a
similar approach on our system without problems. In case, I added a
warning in config-dist.php.
Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle
Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/deprecatedlib.php
Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle
MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set
Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle

Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle
Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle
Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle
Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle
Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle
Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle