MDL-42551 timezone info: updated to 2013h
MDL-42604 scorm: Fix division by zero warnings in error logs
MDL-42604 scorm: Minor coding style fixes
MDL-42525 improve performance of plugin listing
MDL-42044 standardise list of unzipped files in add-on installer
MDL-42044 minor add-on installer unit tests cleanup
MDL-42287 behat: Use string from scorm content, instead of scorm structure
MDL-42537 calendar: locale charset on windows will come from calendartype

date_format_string() will now convert date on windows based on calendar type used
MDL-42147 filepicker: fixed dialog box css issue on IE9.

This patch fix the following issue repository icon size, dialog title bar background color and rounded corner for dialog box.

Conflicts:

	theme/bootstrapbase/style/moodle.css
Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle
Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle
MDL-42330 Automate MDLQA-5257 - An admin can award a site badge
Merge branch 'MDL-42551' of git://github.com/stronk7/moodle
MDL-42631 Filepicker: swap the alt attribute to a title attribute to help usability
Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle

Conflicts:
	lib/upgrade.txt
Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle
MDL-42300 course: improved category re-sort controls.

* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
MDL-42629 course: improved wording on move course dialogue
MDL-42629 course: tweaks CSS for management interface

* Removed grey background from checkboxes and bulk actions.
* Removed blue colouring on subheadings.
* Changed greys to the clean theme greys
MDL-42629 course: renamed re-sort to sort