Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
MDL-43439 behat: Save the screenshots to the specified location
Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle
Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle
Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle
Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle
MDL-41506 theme_bootstrapbase: Implement highlight class
MDL-43619 Roles: reset_role_capabilities function destroys overrides
MDL-43619 Roles: reset_role_capabilities unit test, cache fix
Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
Merge branch '35597-27' of git://github.com/samhemelryk/moodle
Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle
Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle
MDL-43693: assignment: Fix JS error on grading page.
MDL-40533 block_html: Remove styles specific to the block
MDL-43621 badges: Don't display deleted users in badge recipients list
Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle

Conflicts:
	grade/tests/behat/behat_grade.php
	grade/tests/behat/grade_view.feature