Git merges in Moodle 3.3.4 by Andrew Nicols

commit 63401025a965c3f3a83df988418b83b18a14617f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 09 Jan 2018 14:31:25 +0800
Tag:    v3.3.4

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

commit c50907bdfd71e28273a1b051130a475a49e2a5f7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 Jan 2018 15:17:53 +0800
Tag:    v3.3.4

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

commit 65be0f98d8b39885b19ee06dbeaedc9041d80052
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 Jan 2018 15:13:57 +0800
Tag:    v3.3.4

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

commit fa13c8a8cb9792f2c56ae46d94361feec188bd7a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 Jan 2018 12:52:48 +0800
Tag:    v3.3.4

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

commit ccd3ab300d0e894f37e1a62f7640d75b95eb577c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 18 Dec 2017 15:38:21 +0800
Tag:    v3.3.4

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

commit 1c216b13e4597719d2ad8b29bb0082c02aac3fff
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 18 Dec 2017 11:25:10 +0800
Tag:    v3.3.4

Merge branch 'MDL-57564-33-courseorder' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE

commit 35b5315034306d2a83596d6245b69194f52f2f5e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 12 Dec 2017 13:48:29 +0800
Tag:    v3.3.4

Merge branch 'M3.3-MDL-59866' of https://github.com/marcusboon/moodle into MOODLE_33_STABLE

commit 74cc4d6acb42a7a188cf1dc6a248c15fe996f1d8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 12 Dec 2017 13:40:28 +0800
Tag:    v3.3.4

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

commit 5fea1165864ce6792531d7d87e95caf05243b41c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 11 Dec 2017 15:02:44 +0800
Tag:    v3.3.4

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

commit 10d22c10fc4bbf609656fca244c5e808f6a6c46b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Dec 2017 10:05:22 +0800
Tag:    v3.3.4

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

commit b74d94b85e969f034cdcd6f0c4fdac4332cec6ce
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 05 Dec 2017 12:54:32 +0800
Tag:    v3.3.4

Merge branch 'MDL-60801_33' of https://github.com/andrewhancox/moodle into MOODLE_33_STABLE

commit fdea53a86bae9a9888dcfc7a383829b4c0c4b968
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 05 Dec 2017 11:55:33 +0800
Tag:    v3.3.4

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

commit b448376beac6120c3aa5f5b00e3139fb1c737240
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 05 Dec 2017 09:53:33 +0800
Tag:    v3.3.4

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

commit d6d0e0f4be422ff63859fae758c89f18516f4ece
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 05 Dec 2017 09:45:36 +0800
Tag:    v3.3.4

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