Git merges in Moodle 3.2.5 by Andrew Nicols

commit 8c0221add03d2329c7dcf7bfb9d9fcd055fe46ee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 31 Aug 2017 15:01:03 +0800
Tag:    v3.2.5

Merge branch 'MDL-56646-32-fix' of https://github.com/xow/moodle into MOODLE_32_STABLE

commit ceec1f258fbbec2382b3709ffa0cf870ce45828e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 29 Aug 2017 15:52:16 +0800
Tag:    v3.2.5

Merge branch 'MDL-56646-32' of https://github.com/xow/moodle into MOODLE_32_STABLE

commit d7d8b68ae3ed4d7f4cbfbbeaa3620dcb97f4ac0f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 29 Aug 2017 13:17:12 +0800
Tag:    v3.2.5

Merge branch 'MDL-35290-32' of https://github.com/snake/moodle into MOODLE_32_STABLE

commit 9fd6166e32935e892166c6ec1f69705128e74959
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 23 Aug 2017 16:58:38 +0800
Tag:    v3.2.5

Merge branch 'MDL-57412-32' of https://github.com/xow/moodle into MOODLE_32_STABLE

commit 95eb86b4d4653cb8dea8e0212b343b9bc24bd59c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 23 Aug 2017 09:38:51 +0800
Tag:    v3.2.5

Merge branch 'MDL-51827_32' of git://github.com/timhunt/moodle into MOODLE_32_STABLE

commit 1862ff1afb25493cf11ac6968fee6e7fdbca81bb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 16:01:46 +0800
Tag:    v3.2.5

Merge branch 'MDL-59826-32' of https://github.com/snake/moodle into MOODLE_32_STABLE

commit 0030a24f5c94287a48056d3e6f47a79aa0c29ef5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 15:35:35 +0800
Tag:    v3.2.5

Merge branch 'MDL-59825-32' of https://github.com/snake/moodle into MOODLE_32_STABLE

commit e9fc0c3145177d83cfe319ee22a40ba4a7a0ebfb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 14:33:59 +0800
Tag:    v3.2.5

Merge branch 'MDL-59893-32' of https://github.com/snake/moodle into MOODLE_32_STABLE

commit 576f9bf393baff1f25f6aa9c525be792f6af9b4b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 12:34:28 +0800
Tag:    v3.2.5

Merge branch 'MDL-57246-32-forumredirect' of git://github.com/roperto/moodle into MOODLE_32_STABLE

commit 7bf9b144e126791c573bfc1342f047a91335772b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 14 Aug 2017 13:16:58 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-57188-32-2' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit 7be5ceab6ff5ccf5adb54f3b200dede5f6453651
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 14 Aug 2017 12:30:09 +0800
Tag:    v3.2.5

Merge branch 'MDL-59737_32' of git://github.com/markn86/moodle into MOODLE_32_STABLE

commit 1cc7c1c1cf3376046019a6f73fb08a694beb3624
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 14:49:09 +0800
Tag:    v3.2.5

Merge branch 'MDL-51745-moodle32' of https://github.com/jebarviabb/moodle into MOODLE_32_STABLE

commit 8002fc9e279d45a93c1168f0d6016099b7866374
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 13:36:57 +0800
Tag:    v3.2.5

Merge branch 'MDL-59662_32-errors-typo' of https://github.com/lucaboesch/moodle into MOODLE_32_STABLE

commit 284eec64a770c24ccb3bd394fc60f5a2a3a45374
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 12:57:04 +0800
Tag:    v3.2.5

Merge branch 'MDL-59698-32' of git://github.com/damyon/moodle into MOODLE_32_STABLE

commit 046fc0386fb5308a2cf17247a3bf6f565ad21d67
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 12:40:27 +0800
Tag:    v3.2.5

Merge branch 'MDL-59728_32-boost-question-bank-header-align' of https://github.com/lucaboesch/moodle into MOODLE_32_STABLE

commit 18bdade5d7f5f65ca3d22e7b4825d430dcb36530
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 04 Aug 2017 11:49:48 +0800
Tag:    v3.2.5

Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

commit ecebcb44e254dc7ea7365c431ff6b7773e71844b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 Aug 2017 15:50:46 +0800
Tag:    v3.2.5

Merge branch 'MDL-59582-32' of git://github.com/danpoltawski/moodle into MOODLE_32_STABLE

commit 6702f7a90790e9836c30c54e636ba52f88fd3941
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 Aug 2017 12:34:22 +0800
Tag:    v3.2.5

Merge branch 'm32_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle into MOODLE_32_STABLE

commit b3dd3a02782043089d0b53163c848e0ff41e0ca5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 Aug 2017 13:40:28 +0800
Tag:    v3.2.5

Merge branch 'MDL-57259-32' of git://github.com/ryanwyllie/moodle into MOODLE_32_STABLE

commit 082ea214c7bcdaa53d797bc09481e71cd810510e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 Aug 2017 10:52:51 +0800
Tag:    v3.2.5

Merge branch 'MDL-55364-32-fix' of https://github.com/xow/moodle into MOODLE_32_STABLE

commit 8b60f9b1c2f900a9e61b2c279280691af130cce5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 Aug 2017 14:56:44 +0800
Tag:    v3.2.5

Merge branch 'MDL-58928_32-alt-attribute-enrolment-edit-delete-icons' of https://github.com/lucaboesch/moodle into MOODLE_32_STABLE

commit e0818e74b64c7154c446a0e33cd0a3ebf38f8ab9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 Aug 2017 10:51:57 +0800
Tag:    v3.2.5

Merge branch 'MDL-59473-MOODLE_32_STABLE' of https://github.com/sytabaresa/moodle into MOODLE_32_STABLE

commit b42b18958a411462c15eee63f4428f6c1a283bb5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 31 Jul 2017 15:30:11 +0800
Tag:    v3.2.5

Merge branch 'MDL-58196-32' of git://github.com/ankitagarwal/moodle into MOODLE_32_STABLE

commit 8c5da164a5830bfa82e0e5245aeeeef30410244a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 31 Jul 2017 11:51:24 +0800
Tag:    v3.2.5

Merge branch 'm32_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle into MOODLE_32_STABLE

commit 40310fa3489fe3e0ebcda8915c096454d1491462
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 24 Jul 2017 15:29:57 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-38129-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit bd9a279c0e0115079d725515f69a5200e3a62cac
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 24 Jul 2017 13:22:51 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59561-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit 614b87e26e705cc4e96c7ba37b1e8adfc83cd938
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 24 Jul 2017 12:53:20 +0800
Tag:    v3.2.5

Merge branch 'MDL-59490-32' of https://github.com/spvickers/moodle into MOODLE_32_STABLE

commit bfc16833c606525bdde040975e033137671b36e5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Jul 2017 10:44:15 +0800
Tag:    v3.2.5

Merge branch 'MDL-59527-32-fix1' of http://github.com/damyon/moodle into MOODLE_32_STABLE

commit 4fc7dd679a581abd37c920b14b9c0ffc66c841fb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Jul 2017 10:23:56 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-57649-32-fix2' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit 43591af1eaeda117880ac9ad49336f20b2e531a9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 19 Jul 2017 14:59:38 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-39471-32-fix' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit 5d3bf18f2178f376cd92368412e4de178f60a78c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 17 Jul 2017 12:29:44 +0800
Tag:    v3.2.5

Merge branch 'mdl55979-moodle32' of https://github.com/tlock/moodle into MOODLE_32_STABLE

commit 98f10b0102308a287a928a4d8b98d9ac4475b376
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 17 Jul 2017 10:24:37 +0800
Tag:    v3.2.5

Merge branch 'MDL-59371-32' of git://github.com/lameze/moodle into MOODLE_32_STABLE