MDL-42613 core_group: removed unnecessary table row when there is no group description or picture
MDL-40267 forms: added some tests for the range rule
MDL-40267 forms: fix utf8 string length rules
Merge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle
MDL-42402 EditPDF: Make the colours match the mockup in MDL-41633
Merge branch 'MDL-42402-master-fix2' of git://github.com/damyon/moodle
MDL-42363 behat: Avoid random failure because of timing differences
Merge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle
MDL-42629: Fixing dodgy merge conflict (oops)
Merge branch 'MDL-42613_master' of https://github.com/markn86/moodle
MDL-42332 behat: Adding a wait to let AJAX finish the request

The Mark as completed performs an AJAX request,
we need to give time to let it finish.
Merge branch 'MDL-42332-fix-modal-window' of git://github.com/dmonllao/moodle
Merge branch 'wip-MDL-38228-master' of git://github.com/marinaglancy/moodle

Conflicts:
	version.php
MDL-42671 EditPDF: Disable EditPDF is zlib is not available

Also put a warning on the admin page if this is the case.
Merge branch 'MDL-42671-master' of git://github.com/damyon/moodle
MDL-42402 EditPDF: CSS fix for hover on drop down menus

Also required a fix for the comment search window because it was picking up the same styles.
ML-42629 course: management added can_resort checks
Merge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle
Merge branch '42629-26-r2' of git://github.com/samhemelryk/moodle
MDL-40244 forms: added setType() for groupinfo in forum and wiki