MDL-42102 TinyMCE: Correct  additional icons
Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle
MDL-42589: Fix file picker display in ie9/ie10

CSS change to fix blank file picker bug in IE.
Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle
Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle

Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle
Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle
Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle

Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Merge branch 'MDL-42517-m' of git://github.com/micaherne/moodle
Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle
Merge branch 'MDL-42587' of git://github.com/aolley/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-42102 TinyMCE: Fixing dropdown positioning
MDL-42012 TinyMCE: Remove black background on foreground color picker
Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle
MDL-42102 TinyMCE: Update icons
Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle

Conflicts:
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
MDL-42102 ie9 SVG fixes
Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle
Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle

Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js