MDL-41848 SCORM: Drag drop SCORM upload fix
MDL-41888 separate out quiz statistics calculations from report code

also code clean up.
MDL-41888 allow for a blank string as format to mean not to show stat

as in MDL-41929 which applies to older stable branches.
MDL-41888 More comments
MDL-41176 fix obvious bugs and typos in new user API
MDL-41176 make sure fresh full user record is used when mailing email confirmation
MDL-41176 do not set description and pw fields in $USER when editing own profile
MDL-41942 course: Allow course listings to work with caches disabled
MDL-33569 themes: Labels create extra margin below content.
MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css
Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle
Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle
NOBUG: rebuilt bootstrap CSS
Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle
Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle