Git merges in Moodle 3.3.2 by Andrew Nicols

commit c7b53f80a6f713550c796c72d4888a4988ff934f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 31 Aug 2017 15:00:39 +0800
Tag:    v3.3.2

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

commit f26fc77aac78c79e8d12cf830397629dc372acc4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 29 Aug 2017 15:51:44 +0800
Tag:    v3.3.2

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

commit 23a2f3eaac09256903335c82dea32dd8df7ccde2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 29 Aug 2017 15:27:26 +0800
Tag:    v3.3.2

Merge branch 'MDL-59820-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

commit bd90cb526f538e49ba85ee26b325fce07f6ebd7c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 29 Aug 2017 13:15:01 +0800
Tag:    v3.3.2

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

commit e7294cf68e7700519211f019694dcae2a66b4943
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 23 Aug 2017 16:56:54 +0800
Tag:    v3.3.2

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

commit 536566efaf330416105994ef02dbb90ee36a7842
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 23 Aug 2017 09:38:32 +0800
Tag:    v3.3.2

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

commit 69c4972afbb9832c5396855066a462341fb204bb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 15:57:27 +0800
Tag:    v3.3.2

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

commit 9ca48527aa8715412a2dbfae1890f1339c5d6a7c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 15:27:29 +0800
Tag:    v3.3.2

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

commit 22b3c71aa3eed1547ce7f8338110f86170b267c5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 14:32:05 +0800
Tag:    v3.3.2

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

commit 030923e487e19af0bb58296513f26af5fb88d701
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 22 Aug 2017 12:29:24 +0800
Tag:    v3.3.2

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

commit e01475d537495e5111ca7e43d7232aca4f06cfca
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Aug 2017 13:40:44 +0800
Tag:    v3.3.2

Merge branch 'MDL-59746-33' of git://github.com/Dagefoerde/moodle into MOODLE_33_STABLE

commit 9adeff603afa7abefae69d0389b693bde6cbbd03
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 14 Aug 2017 13:15:58 +0800
Tag:    v3.3.2

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

commit 1fc0f4e340b8e7c969af2378daf2a3e8dd0c7002
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 14 Aug 2017 12:26:48 +0800
Tag:    v3.3.2

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

commit 76509889744e87ba45015d64b2625b56000f81d9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 08 Aug 2017 12:55:19 +0800
Tag:    v3.3.2

Merge branch 'MDL-59666-33-fix' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE

commit 4d7df0162e08fa3047a066c577f6157f63678ce5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 14:48:20 +0800
Tag:    v3.3.2

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

commit 235742c6241e3952c8e5d8a828e1cb53ad62f963
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 13:35:20 +0800
Tag:    v3.3.2

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

commit 05f9a38375942c4c0b6a44c8daf5ff6c37b0f5d5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 12:56:27 +0800
Tag:    v3.3.2

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

commit 7fd28388e2bb35ac96b8eecf0a118dca727b3100
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 Aug 2017 12:39:51 +0800
Tag:    v3.3.2

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

commit 3124d6ec6dfe29982731dc290747bcb5ed128f21
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 04 Aug 2017 11:50:10 +0800
Tag:    v3.3.2

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

commit f499964d3d0f3c9ff2cd8ecc025e3a6353e5bfc8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 Aug 2017 15:49:58 +0800
Tag:    v3.3.2

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

commit 2654b0c931de7426f10b11e44da27c9ad237a02d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 Aug 2017 12:32:09 +0800
Tag:    v3.3.2

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

commit 93f9d56886487a94ddf13bc1eb696c9ebc6e35f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 Aug 2017 13:39:49 +0800
Tag:    v3.3.2

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

commit d40a73d8ccb99643708e3ad6ded9ae10462a7aa4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 Aug 2017 10:52:11 +0800
Tag:    v3.3.2

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

commit 45aabba24379402a715aff4f0be348fb6b645787
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 Aug 2017 14:56:10 +0800
Tag:    v3.3.2

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

commit 92502d78d7fabda1ab74b55a988cc04fdddf8c04
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 Aug 2017 10:49:26 +0800
Tag:    v3.3.2

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

commit 3ebca8165d0b89eab37dcf47b3b05efdb6ed3ee9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 31 Jul 2017 15:28:06 +0800
Tag:    v3.3.2

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

commit dd4855cb995f3f415a87f1268de82432b5bdc7a3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 31 Jul 2017 11:50:51 +0800
Tag:    v3.3.2

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

commit b56b5ee8d6c3e9c1381e8677dc867f3a57a60dd1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 26 Jul 2017 14:57:03 +0800
Tag:    v3.3.2

Merge branch 'MDL-59499-33-classfix' of github.com:snake/moodle into MOODLE_33_STABLE

commit 401cbb6c83675db587cd910747c208a4e60ab0a7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 24 Jul 2017 15:24:24 +0800
Tag:    v3.3.2

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

commit 0c534d99c22a19cbdaf2a38a00ddaf6d3c676b99
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 24 Jul 2017 13:21:49 +0800
Tag:    v3.3.2

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

commit 875ea2a42136b3ceab46ed4f713828edb5f42630
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 24 Jul 2017 12:51:32 +0800
Tag:    v3.3.2

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

commit 4cf445396252a679dbe3ff1ac8b9243abf06bab9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Jul 2017 10:43:40 +0800
Tag:    v3.3.2

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

commit c428d5891f9c2495e32dfcd024540b5f9c13b45f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Jul 2017 10:23:01 +0800
Tag:    v3.3.2

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

commit 57158d7df58735844d9bf0709b20d8fbcd60ec67
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 17 Jul 2017 12:29:30 +0800
Tag:    v3.3.2

Merge branch 'mdl55979-moodle33' of https://github.com/tlock/moodle into MOODLE_33_STABLE

commit 0c09410799aa725a25762c125876f848e5290bbe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 17 Jul 2017 10:24:06 +0800
Tag:    v3.3.2

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