MDL-43109: mod/wiki - When editing pages populate the default value for the tags input.
MDL-43460 calendar: Decode event description links on restore
MDL-39661 blocks: Removed notice when moving a block
MDL-40705 theme_bootstrapbase: Handling of long words in block content
MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page
MDL-43412 quiz with grade period and password did not work.

Once the attempt became overdue, it was impossible to get in to submit
it because of a redirect loop. This fix resovles that loop, so the
student can enter their password and get in.
MDL-43590 Merge English strings from the en_fix language pack
MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view
MDL-43371 mod_lesson: Remove files upon page or module deletion
MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported.
MDL-43222 SCORM: correct check for list of attempts and make correct check for current attempt in scorm_get_toc
Merge branch 'MDL-43590-en_fix_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE
MDL-43642 behat: Setting the correct files @package
MDL-46310 assign Prevent blind marking submission notification email being sent to noreplyemail address
MDL-43590 Revert to previous version

There was no unapproval in 25_STABLE, hence the
capability cannot include that concept.
Moodle release 2.5.4
MDL-40693 theme_bootstrapbase: changed navbar separator to official separator
MDL-40821 theme_bootstrapbase: show the current lang in the menu
MDL-40821 theme_bootstrapbase: fixed positioning of profile controls

Conflicts:
	theme/bootstrapbase/style/moodle.css

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-39661-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE