MDL-41772 - mod_data: Fixed database_module comments not being restored.
MDL-40550 badges: Change wording of badge activation message

Add confirmation check when activating badge from management page
MDL-41833 feedback: Fix setType() warning when deleting a response in feedback
MDL-41594 Bug fix for orphaned invisible categories

thanks to L.Sanocki
MDL-40848 badges: Validate backpack connection via Persona

    Instead of trusting that the user owns the email address they
    supply, we now require them to login via Persona before
    connecting them to the backpack
MDL-41852 Resource: Does not have generator
MDL-41342 admin: Adding warning when upgrading a test site
MDL-41907 Repositories: Maintain the sortorder of a file when overwriting it.
Automatically generated installer lang files
Merge branch 'wip-MDL-41772-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE
MDL-36465 Course JavaScript: Ensure that the zero section is not draggable
MDL-41910 user: Allowing LASTACCESS_UPDATE_SECS overwrite
Merge branch 'MDL-41833-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
MDL-41929 quiz statistics, overall stats not displayed.
Merge branch 'MDL-36465-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40848_m25' of git://github.com/totara/openbadges into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
Automatically generated installer lang files
MDL-40903 cache: converted persistent into persistentdata

At the same time all cache instances were made persistent
MDL-40903 cache: coding style tidyup pre-integration
MDL-40903 cache: Unittests and small fixes for persistent application cache