Git merges in Moodle 3.6.0 by Damyon Wiese

commit 1a368ec351b78e0fab0c29ed9ce534a372222373
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 29 Nov 2018 14:46:55 +0800
Tag:    v3.6.0-rc3

Merge branch 'MDL-64264_master' of git://github.com/markn86/moodle

commit dda38f91ab7d15e5e4feca9909342c087e3f4b25
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 29 Nov 2018 11:04:38 +0800
Tag:    v3.6.0-rc3

Merge branch 'MDL-64245-master-fix-1' of git://github.com/ryanwyllie/moodle

commit 2a9e70a8181f9be774ffbce728535e8630f45fb7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 28 Nov 2018 10:15:35 +0800
Tag:    v3.6.0-rc2

Merge branch 'MDL-64099-master-fix' of git://github.com/junpataleta/moodle

commit 35889e23b73ec3dd1bd8740745c979dec608e250
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 23 Nov 2018 12:21:13 +0800
Tag:    v3.6.0-rc1

Merge branch 'MDL-64180_master' of git://github.com/markn86/moodle

commit 730284fc16c149bb39f945d73086f5e2dc341a94
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Nov 2018 10:07:42 +0800
Tag:    v3.6.0-rc1

Merge branch 'MDL-64054-master' of git://github.com/ryanwyllie/moodle

commit a356db0db2c137bf2f3c8d55c49cb1f191df25ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Nov 2018 16:28:13 +0800
Tag:    v3.6.0-rc1

Merge branch 'MDL-63973-master' of https://github.com/snake/moodle

commit 365dce5fad6a08402adabeb1a79afa6ced4f99a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Nov 2018 14:51:46 +0800
Tag:    v3.6.0-rc1

Merge branch 'MDL-63696-master' of https://github.com/Dagefoerde/moodle

commit ba88292a3d9a779dc604635c91c1026eccf4f22c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 16 Nov 2018 10:35:37 +0800
Tag:    v3.6.0-beta

Merge branch 'wip-MDL-63854-master' of https://github.com/kwiliarty/moodle

commit f4ccea6f528dba76afc37c6ab517ad6e8fba8b30
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 15 Nov 2018 16:30:20 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-64009-master' of git://github.com/abgreeve/moodle

commit 47dc7eb8a46c759c439d72f478c882e8a71f4b1d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 15 Nov 2018 16:10:21 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle

commit 02c4de86eabe5f98b391e61af3d655b7420d5c6f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 15 Nov 2018 10:43:03 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63283-master-2' of https://github.com/snake/moodle

commit 54869cdeac7560da3daa661d56ee499b8cd7aec3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 14 Nov 2018 16:00:14 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-64005-master' of git://github.com/abgreeve/moodle

commit 89ffc1ee0e498d70d0a47a19a3747e7b8ca1d465
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 14 Nov 2018 15:04:01 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-53566-master' of git://github.com/andrewnicols/moodle

commit 8043762c80eef7041e61e77daf7108d2699d2b21
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 14 Nov 2018 12:11:12 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63868-master' of git://github.com/abgreeve/moodle

commit 462fc2abcd9ac443bc0fb4ee315b83c9c3c02d67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 14 Nov 2018 11:14:18 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63901-master' of git://github.com/sarjona/moodle

commit bed93cff286ddb00c9e890efa9f281d71501b195
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 13 Nov 2018 11:57:12 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63927' of git://github.com/stronk7/moodle

commit eac24f2b71dcfdcc44921d097c4aeb7166929244
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 12 Nov 2018 16:36:57 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63945_master' of git://github.com/markn86/moodle

commit b0f45a8b8f14278a2f6f0de4023c1714b801b508
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 12 Nov 2018 14:16:31 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63724-master-3' of https://github.com/snake/moodle

commit 75e66619400b6851c238f4637833e7c2cbe0c89b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 12 Nov 2018 14:01:01 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63909_master' of git://github.com/markn86/moodle

commit 080cc5b671ff654593deb63be571b9328a373879
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 12 Nov 2018 10:02:25 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63864_master' of git://github.com/markn86/moodle

commit 3dc6208961557ea6c993eb9ee20e6e17d411473a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 09 Nov 2018 10:54:35 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62415-master' of git://github.com/peterRd/moodle

commit ba3b0cc6ac10884ba00f0746516263d77da5d2f3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 09 Nov 2018 09:48:39 +0800
Tag:    v3.6.0-beta

Merge branch 'wip-MDL-63894-master' of https://github.com/kwiliarty/moodle

commit d3fdd7442be174c3418285512eda991c61628551
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 09 Nov 2018 09:12:49 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63671-master-2' of git://github.com/mihailges/moodle

commit bc8584193af9a92127251b93240a405344202c3c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 08 Nov 2018 14:00:00 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63282_master' of git://github.com/markn86/moodle

commit c338d6487c04acc39bf92f3ab4dfd77d1aa2f81f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 08 Nov 2018 09:41:16 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63875' of https://github.com/timhunt/moodle

commit d4035711f9680b1a5063c7f379a00358e209c290
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 Nov 2018 15:30:52 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63898-master' of https://github.com/snake/moodle

commit da151c9b757e4fb726a101fe2375784880a16ee2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 Nov 2018 14:29:02 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63839_master' of git://github.com/markn86/moodle

commit 8313f552b608b42861aa61316f3b7d894095af57
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 Nov 2018 12:05:27 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63451' of https://github.com/peterspicer-catalyst/moodle

commit eb935dab5b3198dbe6df88f308aae3e6c2c2b594
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 Nov 2018 11:00:41 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63884-master' of https://github.com/snake/moodle

commit 1c7288e79b19b03f1e9b7cde28d92a7ca6d015e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 06 Nov 2018 16:45:48 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-58454-master-fix' of git://github.com/junpataleta/moodle

commit d769d7c2dbc1848c47737766198a9e2b2230c0eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 06 Nov 2018 11:39:09 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63297' of https://github.com/timhunt/moodle

commit f6ca9ca691f2ca7574c8025617da8355b7dbd4e7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 Nov 2018 15:07:26 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-44137_add_update-groups_webservice' of https://github.com/TheVirtualLtd/moodle

commit 4f26d21886f13fb8cc9d3ebd3ae5d6949efab392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 Nov 2018 13:45:25 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63717-master' of git://github.com/jleyva/moodle

commit 842138a7cb2c64c2a9502873b780c6899d7daf89
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 Nov 2018 10:28:11 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63827' of https://github.com/timhunt/moodle

commit fb3ab37a67cb509c3da17eb465d109f89ca6d4e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 02 Nov 2018 10:17:54 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63549-master' of https://github.com/snake/moodle

commit bbbf9667c048871eb4f1c25c85de8425571dc265
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 01 Nov 2018 12:57:55 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63063-master-block' of https://github.com/vmdef/moodle

commit 1becffad4409a3bdd956fededd5bb1339addf3b9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 01 Nov 2018 09:03:06 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63549-master' of https://github.com/snake/moodle

commit 554c7916c0258e7997c3b770a9f4edc533da944d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 31 Oct 2018 14:39:36 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-58943-master-revised' of github.com:damyon/moodle

commit 1524c4d66c937fdd9595f31839f69e82ff7eb713
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 25 Oct 2018 08:36:49 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle

commit 54697072a630654a42f125ad9a14b55db05ef6c4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Oct 2018 11:43:24 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62960-master' of git://github.com/rezaies/moodle

commit 2debe416c65699638904e12968f92f2af91901dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Oct 2018 14:50:10 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63352-master' of git://github.com/peterRd/moodle

commit 283acb8b223dcf6739e317268a9807db33a78508
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Oct 2018 13:29:31 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63041-master' of git://github.com/bmbrands/moodle