MDL-48206 block_comments: textarea width 100%
MDL-46865 report_log: Fixed site name in behat step
Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle
MDL-29585 mod_wiki: Prevent broken links in editable sections

When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle
MDL-29585 wiki: fix unit test fails
MDL-48251 behat: Shuffling activity creation fix quiz behat
Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle
Merge branch '48206-29' of git://github.com/samhemelryk/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-43628 mod_assign: fixed formatting of statement
MDL-46531 editor_atto: fontcolor -> backcolor