Git merges in Moodle 3.1.1 by Andrew Nicols

commit be5d94c45445f951bf7cb2910c76bbd26acbc1fc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 08 Jan 2019 06:57:07 +0800
Tag:    v3.1.16

Merge branch 'MDL-63276_31' of https://github.com/stronk7/moodle into MOODLE_31_STABLE

commit 6776687817588a89de4795f80db9b3fade36f01c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Oct 2018 08:57:36 +0800
Tag:    v3.1.15

Merge branch 'MDL-63421_31' of git://github.com/stronk7/moodle into MOODLE_31_STABLE

commit 8ee12efa228ce2cd64d00a576e1bcf40785e4ee5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 25 Sep 2018 09:18:27 +0800
Tag:    v3.1.15

Merge branch 'MDL-63346_31' of https://github.com/stronk7/moodle into MOODLE_31_STABLE

commit 6fb9c392568e79cb7b764d460747c60ff9bf8850
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 17:55:08 +0800
Tag:    v3.1.11

Merge branch 'MDL-61269_31' of git://github.com/stronk7/moodle into MOODLE_31_STABLE

commit 5e99464c96a3a63d07231d77e5e1ee53b6ec91f8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 11:02:28 +0800
Tag:    v3.1.11

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

commit cf877600b76109d32fa7910a649f845c3a5c2360
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Dec 2017 10:06:26 +0800
Tag:    v3.1.10

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

commit 56d67f1a9d8eebfa49f2e1e271189e46e0c88aab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 07 Jul 2016 11:29:14 +0800
Tag:    v3.1.1

Merge branch 'wip-mdl-55043-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE

commit 6416b84bd6cb173d0516722c396786961a96f609
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 07 Jul 2016 10:48:48 +0800
Tag:    v3.1.1

Merge branch 'MDL-54869-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit 9563554a1af37d04f8f554db140f311895f0a1b4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Jul 2016 15:02:16 +0800
Tag:    v3.1.1

Merge branch 'MDL-54734-31' of git://github.com/lameze/moodle into MOODLE_31_STABLE

commit 40867c234aead9c039ad7db64d7449cd1555b138
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Jul 2016 12:02:31 +0800
Tag:    v3.1.1

Merge branch 'MDL-54165-31' of git://github.com/ryanwyllie/moodle into MOODLE_31_STABLE

commit 61453e1a79b7fe16892689af86748cd82395bf19
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Jul 2016 11:08:05 +0800
Tag:    v3.1.1

Merge branch 'MDL-54165-31' of git://github.com/ryanwyllie/moodle into MOODLE_31_STABLE

commit cdea4ac6b9bd373502f666efe4fb7396442c8823
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 15:18:59 +0800
Tag:    v3.1.1

Merge branch 'MDL-54953-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 6db40f889f32f7e5c81ade2f03517edcddf8b41e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 14:22:19 +0800
Tag:    v3.1.1

Merge branch 'MDL-55049-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit e0db9ee82f60df07e8364b7264e469f3a63c7b81
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 14:14:52 +0800
Tag:    v3.1.1

Merge branch 'MDL-55053-31' of git://github.com/merrill-oakland/moodle into MOODLE_31_STABLE

commit 388367917d01e777364326856aba75652d074f9a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 12:14:09 +0800
Tag:    v3.1.1

Merge branch 'MDL-54877-31-clean-on-output' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit 0c725854e554ccf07166be788287921cfc1af5ef
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 11:26:18 +0800
Tag:    v3.1.1

Merge branch 'MDL-55020-31-pluginzip' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

commit 965b65b7fc6968ef5513c7f1fd4109a2433fe436
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 10:32:50 +0800
Tag:    v3.1.1

Merge branch 'MDL-54968-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 759f83aa6326b0be05524fc6d156c02db6363bc5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 09:10:19 +0800
Tag:    v3.1.1

Merge branch 'MDL-53019_31' of git://github.com/stronk7/moodle into MOODLE_31_STABLE

commit 9c6b1e40e5687ea27751d523f53ad21826196d41
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 01 Jul 2016 10:20:32 +0800
Tag:    v3.1.1

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

commit c944c35cff4f4ce7cbecd142f3b888a655fecc1e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 29 Jun 2016 09:25:38 +0800
Tag:    v3.1.1

Merge branch 'MDL-54610_31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 04bb5da9dea0d31a34735e6155482d2ac7d796c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 15:32:24 +0800
Tag:    v3.1.1

Merge branch 'MDL-54991-31' of git://github.com/crazyserver/moodle into MOODLE_31_STABLE

commit 25a4f6c2d6423c3dfac9e7608a83ecef92e89fc3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 15:21:42 +0800
Tag:    v3.1.1

Merge branch 'MDL-54909-31' of git://github.com/crazyserver/moodle into MOODLE_31_STABLE

commit 82f52c19fa6e878949a114ae229d9a8e7835d28c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 12:57:23 +0800
Tag:    v3.1.1

Merge branch 'MDL-54910_m31v2' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit 143e3dc11ce2bb4757a264b15a3c8b7970f44526
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 12:40:10 +0800
Tag:    v3.1.1

Merge branch 'MDL-54911_m31v3' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit a1a562fbbe8f4490966148f06bdb022bc00809c8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 09:55:08 +0800
Tag:    v3.1.1

Merge branch 'MDL-54755_moodle31' of https://github.com/StudiUM/moodle into MOODLE_31_STABLE

commit e31f0fdf7e8908e54c1a52c2b0d1056e03e0698d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 09:40:19 +0800
Tag:    v3.1.1

Merge branch 'MDL-54935-31' of git://github.com/ryanwyllie/moodle into MOODLE_31_STABLE

commit b228a7cf40f6430a7718a90b41d93f1a56d3e605
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 08:47:42 +0800
Tag:    v3.1.1

Merge branch 'MDL-54964-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit e9ae977cb8ca71224113104c62f77f111146cfce
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 08:33:10 +0800
Tag:    v3.1.1

Merge branch 'wip-mdl-54974-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE

commit e0b8d7864f89c21ab685a40ee5b235df2e60d3ad
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Jun 2016 14:18:36 +0800
Tag:    v3.1.1

Merge branch 'MDL-53111_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit cd7cc956378c8ce0ecea729d5cb9cb0e567d5043
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Jun 2016 13:15:37 +0800
Tag:    v3.1.1

Merge branch 'MDL-54924-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit d53a433b6f382c2173ee7e0f88b39e3b8e4d7cb1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Jun 2016 09:20:55 +0800
Tag:    v3.1.1

Merge branch 'MDL-54785-31' of git://github.com/FMCorz/moodle into MOODLE_31_STABLE

commit 7f2fd69024970d33e6d970cfbebb0109c4c7231e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 23 Jun 2016 14:49:45 +0800
Tag:    v3.1.1

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

commit e9019af21dc97f7f0e89515e87a54eedfa9eafcc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 23 Jun 2016 11:01:49 +0800
Tag:    v3.1.1

Merge branch 'MDL-54948-31-fix2' of https://github.com/lameze/moodle into MOODLE_31_STABLE

commit 988b11c4da5490fd8f6564704e8645016445fadc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 22 Jun 2016 14:49:05 +0800
Tag:    v3.1.1

Merge branch 'MDL-54948-31-fix' of https://github.com/lameze/moodle into MOODLE_31_STABLE

commit afee01ac2f59049add17bdfb3270b9eeae16f0da
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 14:19:09 +0800
Tag:    v3.1.1

Merge branch 'MDL-54920-m31' of https://github.com/sammarshallou/moodle into MOODLE_31_STABLE

commit f4d1b3ec4072440ea48822f4030cfeb0658e4014
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 12:10:20 +0800
Tag:    v3.1.1

Merge branch 'MDL-54894-31' of git://github.com/crazyserver/moodle into MOODLE_31_STABLE

commit d5088c4ef5b1768221e161a25d38c5c81b314114
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 11:54:00 +0800
Tag:    v3.1.1

Merge branch 'MDL-54940-31' of https://github.com/LukeCarrier/moodle into MOODLE_31_STABLE

commit cbcbf005fb65741652211ba442e549bf76a2b403
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 11:32:19 +0800
Tag:    v3.1.1

Merge branch 'MDL-54881_31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE

commit 4e1af2ead5dcf7683946ad7b172e53c077cbd4de
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 11:22:52 +0800
Tag:    v3.1.1

Merge branch 'MDL-35104-31-2' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE

commit cb2844dc4007e46224931c4e09ffcf973dbfd586
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 10:30:46 +0800
Tag:    v3.1.1

Merge branch 'MDL-51505-31' of git://github.com/FMCorz/moodle into MOODLE_31_STABLE

commit 261eb3295563f3d57f98a6588dd7afe8631dac65
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Jun 2016 08:24:42 +0800
Tag:    v3.1.1

Merge branch 'MDL-54559-int-31' of https://github.com/merrill-oakland/moodle into MOODLE_31_STABLE

commit 894ed0c657008188e5080924d0b234239ff7b8ff
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 16:06:09 +0800
Tag:    v3.1.1

Merge branch 'MDL-54712-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit 07c8765f2b3e7e935107d4d51158913e894455ae
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 14:30:20 +0800
Tag:    v3.1.1

Merge branch 'MDL-54559-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit c4c826305d25ee1d57c202aa3fd730633898eda9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 13:27:10 +0800
Tag:    v3.1.1

Merge branch 'MDL-54797_31' of git://github.com/aolley/moodle into MOODLE_31_STABLE

commit cff883d5a161484da8506402be9fecbabcdece6c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 11:54:19 +0800
Tag:    v3.1.1

Merge branch 'MDL-54787-31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit e744a082e141034f99bc4e3984243d841626e50d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 11:01:31 +0800
Tag:    v3.1.1

Merge branch 'MDL-54859_31' of git://github.com/dmonllao/moodle into MOODLE_31_STABLE

commit 2331a70c899e333892b31ad0cf7c58eca373bb77
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 09 Jun 2016 09:54:37 +0800
Tag:    v3.1.1

Merge branch 'MDL-54853-31' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE

commit a72a8de00ca73ded4baf706b2812f518cd5b6a29
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Jun 2016 08:46:51 +0800
Tag:    v3.1.1

Merge branch 'MDL-53947-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit eb17d699abb429e3ebd1bb90fdd81d3e9153036a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 01 Jun 2016 12:24:32 +0800
Tag:    v3.1.1

Merge branch 'MDL-54722-31' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE

commit 328bc4303935516e9a589f92a1916dbd3b38bc68
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 01 Jun 2016 08:25:26 +0800
Tag:    v3.1.1

Merge branch 'MDL-53598-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 347cab92beed631c0a52f32d13aec99413527f93
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 May 2016 13:50:17 +0800
Tag:    v3.1.1

Merge branch 'MDL-54655_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit 78792b028f8446db418b60013a597644f0a399e1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 May 2016 15:19:35 +0800
Tag:    v3.1.1

Merge branch 'MDL-54756_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE

commit 6381f3bfe0f3c4ac61bdef7705367e78299ff5d1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 May 2016 14:41:48 +0800
Tag:    v3.1.1

Merge branch 'MDL-54567-31-build' of git://github.com/FMCorz/moodle into MOODLE_31_STABLE

commit f14ddb2a8ca1a55a7db3969a3c1dfd822c441b45
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 May 2016 13:40:56 +0800
Tag:    v3.1.1

Merge branch 'MDL-35987-31' of git://github.com/FMCorz/moodle into MOODLE_31_STABLE

commit 87ae1417bfd9fedd5e7021207d1f30237809175c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 May 2016 14:53:56 +0800
Tag:    v3.1.1

Merge branch 'MDL-54715-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 98e440761516e069e54ec3564827ca320863234d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 May 2016 09:06:35 +0800
Tag:    v3.1.1

Merge branch 'MDL-53687-31' of git://github.com/FMCorz/moodle into MOODLE_31_STABLE