MDL-42605 portfolio_flickr: Photos can be added to a set on export
MDL-42605 portfolio_flickr: Do not auto select a set to export to
MDL-42640 quiz: Fix restore of backup without overduehandling setting

Use default quiz overduehandling setting when restoring a
backup from older Moodle version that does not have a quiz
overduehandling setting.
MDL-39800 tags: resolved weighting in block content
MDL-39800 tags: Applied weight and ordering fix on all more page options

Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical
MDL-39800 tags: moved cloud sorting to print function
MDL-42728 Merge English strings from the en_fix language pack
Merge branch 'wip-MDL-41309-25STABLE' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE
MDL-39800 tags: Fix tags/upgrade.txt version number in backport
Merge branch 'MDL-42640-25' of https://github.com/colin-umn/moodle into MOODLE_25_STABLE
MDL-38743 add private cache headers
Merge branch 'MDL-42728-en_fix_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42605-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42666-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
MDL-42666 tests: Setting new Box.net mandatory arguments