Git merges in Moodle 3.3.6 by Andrew Nicols

commit 51f0dbbcda652f239496a7aafb92da62be34fdfd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 16 May 2018 14:30:03 +0800
Tag:    v3.3.6

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

commit 8d85f96696172716def8556f9c19b1dc67b26180
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 16 May 2018 11:02:51 +0800
Tag:    v3.3.6

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

commit 85d42a024b657dde5e4bf7992239842b2a8ed2e3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 May 2018 11:39:25 +0800
Tag:    v3.3.6

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

commit 1ea41504b4246e0f060f520b137ea9da2195cd4d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 May 2018 11:06:01 +0800
Tag:    v3.3.6

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

commit 533ef686e4303190655a2e4e0c7cdef03e75ff8a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 14 May 2018 21:03:03 +0800
Tag:    v3.3.6

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

commit 3fe971f407af2ef5956e31f652e47f92458c3188
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 14 May 2018 20:47:33 +0800
Tag:    v3.3.6

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

commit c0e4458f2829bc58c2b888f5ed6ae0c2497f19a7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 11 May 2018 10:50:23 +0800
Tag:    v3.3.6

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

commit e6762029024e80f8b04b6105e06f2c46a4a357af
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 21:12:24 +0800
Tag:    v3.3.6

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

commit c606e82d4b5db54cc21c284290c44fbac3c6e181
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 18:44:30 +0800
Tag:    v3.3.6

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

commit f0bec9ecdfc16797aef072e68036c20df74e2d83
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 18:36:50 +0800
Tag:    v3.3.6

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

commit c1fef4c9c356969707d41665dffd4224d274d3a2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 16:14:23 +0800
Tag:    v3.3.6

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

commit 524cd5de9cd79d218e4c0fb4ff1b15ef4425b646
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 15:50:48 +0800
Tag:    v3.3.6

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

commit dce88130211a4d3f4d84f8a0568e050cf56a8240
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 11:45:49 +0800
Tag:    v3.3.6

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

commit 9c2f2a1ac046dfd9431041d8c42873b415eaeb78
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 10:25:06 +0800
Tag:    v3.3.6

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

commit 856b9709041a683c7c57d67c5196a8241d71470b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 09 May 2018 08:53:56 +0800
Tag:    v3.3.6

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

commit 6554a3d31e211017d7f1d33db5377c36075c9212
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 08 May 2018 14:45:40 +0800
Tag:    v3.3.6

Merge branch 'wip-MDL-61937-33-fix' of https://github.com/marinaglancy/moodle into MOODLE_33_STABLE

commit 3ff77e753ba39c8d9caf7b7e622a9ac9aafa720b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 08 May 2018 11:48:35 +0800
Tag:    v3.3.6

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

commit eb8a915468ed76105afbf43d8005341ad0061dab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 08 May 2018 11:16:20 +0800
Tag:    v3.3.6

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

commit 9b3ce309f76df473f168f52d80ae3614a25d8cc8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 May 2018 17:27:18 +0800
Tag:    v3.3.6

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

commit 19afe6488f21818d050f44f419a983bcf08dc9da
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 May 2018 15:53:33 +0800
Tag:    v3.3.6

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

commit f819f0f992fcb8999741010fc7222aea9395d164
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 May 2018 15:30:49 +0800
Tag:    v3.3.6

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

commit 266d7f04ff52fa911c0de4d4467797cc2c048352
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 May 2018 14:18:56 +0800
Tag:    v3.3.6

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

commit 01bde600e3b3da7a6f374a964923c79afa851b7b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 07 May 2018 13:52:22 +0800
Tag:    v3.3.6

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

commit e6c53933a5b8b1fd7ae918833b5116c87081bfe0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 04 May 2018 11:30:29 +0800
Tag:    v3.3.6

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

commit b61831036467c58202063880411788806f131212
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 May 2018 19:06:33 +0800
Tag:    v3.3.6

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

commit 0202ab0473d2f456e2384a5924bff568e6a2293f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 May 2018 12:36:18 +0800
Tag:    v3.3.6

Merge branch 'MDL-62009-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit bce56f503175910041a06d19258cdadbc23787bc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 03 May 2018 11:11:55 +0800
Tag:    v3.3.6

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

commit 78404d41349bdbbe665c052633cd3baad5ddd145
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 May 2018 17:47:59 +0800
Tag:    v3.3.6

Merge branch 'MDL-62135-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit ebe14385a9147909174160533772d50d54c45f23
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 May 2018 13:07:05 +0800
Tag:    v3.3.6

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

commit 5648cec536a45af87324617c5fc61f65890d3077
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 May 2018 12:34:58 +0800
Tag:    v3.3.6

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

commit f80f15a1784ef5e1d4fe5bf2c716f04441ba5e07
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 May 2018 12:29:50 +0800
Tag:    v3.3.6

Merge branch 'MDL-62214-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 70ebf686fdcbaff4e69ef2eda3bcb06b2864e8ee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 May 2018 10:55:00 +0800
Tag:    v3.3.6

Merge branch 'MDL-62236-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 2cff7ff95fbe8fa04cac0e56ea3f6b003e613f84
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 May 2018 15:00:31 +0800
Tag:    v3.3.6

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

commit 40b9237b49df6de577eb021f477ed777e04e7ec6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 May 2018 12:10:45 +0800
Tag:    v3.3.6

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

commit 0ef3ff5b68b65c1539db7a9abab0d88c94186653
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 May 2018 11:57:54 +0800
Tag:    v3.3.6

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

commit ff6db243c08f000b4e9cb5f59a76f942cd2250e5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 May 2018 11:24:47 +0800
Tag:    v3.3.6

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

commit 515f4ea924eb589067a5c9f3f8726751bdbe09f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 01 May 2018 11:15:12 +0800
Tag:    v3.3.6

Merge branch 'MDL-62167-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 774835181e90b8eb9447730f6c5e79709a423547
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Apr 2018 16:02:33 +0800
Tag:    v3.3.6

Merge branch 'MDL-62248-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 69943f974b078a6288c41922bcf34465341b47a1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Apr 2018 14:01:51 +0800
Tag:    v3.3.6

Merge branch 'MDL-62235-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 37427de44e275abda8d7ff7a39e1b0d9b4b5fd4a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Apr 2018 13:21:09 +0800
Tag:    v3.3.6

Merge branch 'MDL-62208-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit be2d84d91310172aa42710c43b968bf2f56fc67c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Apr 2018 11:45:41 +0800
Tag:    v3.3.6

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

commit ee5530d55230ce20fcc5a64066f74170d12a225c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Apr 2018 10:26:04 +0800
Tag:    v3.3.6

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

commit ca427f53892a1e4f48079585fb3384542b84392e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Apr 2018 09:22:30 +0800
Tag:    v3.3.6

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

commit a20987ace8cbae0d43408078a3410caf2eb8a8fd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Apr 2018 15:01:11 +0800
Tag:    v3.3.6

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

commit 4444333a285e02ea7608d56faf15927cd32eeab5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Apr 2018 14:52:55 +0800
Tag:    v3.3.6

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

commit 08339c279943f63ca79a0f2d0d18f81b24fba1f8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Apr 2018 08:35:21 +0800
Tag:    v3.3.6

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

commit 06e1ec0cf4a998394ab230f1d0b198f3aff387b9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Apr 2018 10:19:49 +0800
Tag:    v3.3.6

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

commit 660d630ad5dc06d6cb7a321b5a8277176d6de6f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Apr 2018 09:34:53 +0800
Tag:    v3.3.6

Merge branch 'MDL-61984-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit f203772256fd1a79f2ec2ec6da2d4ad7cc6daed1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Apr 2018 08:21:33 +0800
Tag:    v3.3.6

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

commit f9bbcab7820a4de0ff590412eb0c9076b4222532
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 23 Apr 2018 18:32:45 +0800
Tag:    v3.3.6

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

commit 501dec02713406363c3f332fcc44abb52559811b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 23 Apr 2018 16:05:23 +0800
Tag:    v3.3.6

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

commit 368436baac55824ea1f0b87957c454d4e00cec39
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Sun, 22 Apr 2018 21:06:41 +0800
Tag:    v3.3.6

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

commit a55d5c8292c37bf1c3e6ab465f515e354ecdaf63
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 20 Apr 2018 11:49:59 +0800
Tag:    v3.3.6

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

commit 4caf14d0dcd92617f2eeccbe64cb9fab7fd247c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 20 Apr 2018 11:36:19 +0800
Tag:    v3.3.6

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

commit 6a76fdfa4093571f58d1c6743f196074480c0ab2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 20 Apr 2018 10:43:54 +0800
Tag:    v3.3.6

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

commit b71fc4ce4b08d8c0d3d63011e0956b98bbbc9789
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 20:37:33 +0800
Tag:    v3.3.6

Merge branch 'MDL-61836-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit af1c6447123a55f28d03cbc6fa4aeebcc9b1cd26
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 15:01:37 +0800
Tag:    v3.3.6

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

commit 3a84788acf75e54b601b898d420bd4896bf8ebbe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 14:54:02 +0800
Tag:    v3.3.6

Merge branch 'MDL-61970-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 78ecf75ead8017fd94a914197e90cbcbce28f61b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 14:49:44 +0800
Tag:    v3.3.6

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

commit 521751de6957a5dc741e868574f1e12a1cf5ed9b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 11:56:32 +0800
Tag:    v3.3.6

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

commit c813b072541ef4f2dd5ec4095114f6b52b8ab2aa
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 11:47:50 +0800
Tag:    v3.3.6

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

commit 399252fd85b6b66f868348e3372e4f504f8b4ea1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 11:22:07 +0800
Tag:    v3.3.6

Merge branch 'MDL-61836-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit bdbe55c831341809c9dffff9c6c3f4de70fe8c8b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Apr 2018 11:13:53 +0800
Tag:    v3.3.6

Merge branch 'MDL-61970-33-56' of git://github.com/FMCorz/moodle into MOODLE_33_STABLE

commit 5298471d0fdb77e64c1a9938fd41c20e519e8160
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Apr 2018 14:26:01 +0800
Tag:    v3.3.6

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

commit 132ea1c052b6b9b77122bf4a11b0998969fc75dd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Apr 2018 13:10:34 +0800
Tag:    v3.3.6

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

commit 3b8ee4c3a06df383c6fc6c09bd83d4495bac8c4d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 Apr 2018 11:46:58 +0800
Tag:    v3.3.6

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

commit db1a3e66239e69d3d6a9c9fd4ab3636500074d11
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 Apr 2018 11:43:32 +0800
Tag:    v3.3.6

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

commit ace39db60fb192eac7fa7eea88508684ccce3bed
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 Apr 2018 11:35:37 +0800
Tag:    v3.3.6

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

commit 4dd2d6a7e0f3e3a0cdbf9a281169b7499efbd6dd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 Apr 2018 11:19:40 +0800
Tag:    v3.3.6

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

commit d405b3b89ac27f8ad562a953e1b1f4f70dcce0e2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 Apr 2018 11:13:16 +0800
Tag:    v3.3.6

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

commit 8cd3227cd43e7c99122e0b4795bb77fcd8ce8a14
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 Apr 2018 11:10:36 +0800
Tag:    v3.3.6

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

commit b88a6ac832a869b996c01e617d0984de20a6591f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 16 Apr 2018 10:52:15 +0800
Tag:    v3.3.6

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

commit 4ccebf873e02542f503f24a90f616ce3e3d27612
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 16 Apr 2018 10:47:35 +0800
Tag:    v3.3.6

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

commit bc773899973c018053f69de6bae27fdc74982872
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 16 Apr 2018 10:22:10 +0800
Tag:    v3.3.6

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

commit 1a83ee366d42b1def894e47842d46bb2ea5ff2c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 Apr 2018 10:16:24 +0800
Tag:    v3.3.6

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

commit 9280d2ca0bdee787568b809e1600ecfcc54402ab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 Apr 2018 09:12:51 +0800
Tag:    v3.3.6

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

commit 1eaf0be6ed97a9782f450ecc9de94286d111d0b4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 Apr 2018 08:52:42 +0800
Tag:    v3.3.6

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

commit 94714224d9a7b1594bfbb266f5a8c54d40adcf16
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 10 Apr 2018 10:58:15 +0800
Tag:    v3.3.6

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

commit d2979fb33f84fe3df3820c8301655d1a355a81a3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 09 Apr 2018 15:30:15 +0800
Tag:    v3.3.6

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

commit 34931397bc348b004163229e591fe8f5148b87eb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 09 Apr 2018 10:40:56 +0800
Tag:    v3.3.6

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

commit 2aa76eae1d655f590fdabcab70dcb74c767703c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 05 Apr 2018 08:39:39 +0800
Tag:    v3.3.6

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

commit ed070b8d46aee87ad374e8b03b2448b0ede08b8e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 04 Apr 2018 13:08:49 +0800
Tag:    v3.3.6

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

commit 86b5c08a80d8bea0cd68c5679b11ff7fb104a64f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 04 Apr 2018 11:32:42 +0800
Tag:    v3.3.6

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

commit 80ca92cfc7424ad9f7e2374d451bb59c7da745ed
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 04 Apr 2018 09:12:08 +0800
Tag:    v3.3.6

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

commit 5e8a151aff806216da0986279d0be7f84cf3b07a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 03 Apr 2018 16:00:25 +0800
Tag:    v3.3.6

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

commit abf6c76dbf72d654134388caf993a1ee20699197
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 03 Apr 2018 14:21:58 +0800
Tag:    v3.3.6

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

commit 69b780e97aa39e69d3d8e16b63fbf647fdd56464
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Mar 2018 15:36:27 +0800
Tag:    v3.3.6

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

commit 9f271d765d02945581aa9f758df5e3213ed67a3e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Mar 2018 15:02:41 +0800
Tag:    v3.3.6

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

commit f9bd55fae3a10010bf49259d1cad1f6ac57f0337
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 22 Mar 2018 11:49:55 +0800
Tag:    v3.3.6

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

commit eb82d420f01598636fd52ffd1eeb2ba7d7a4269e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Mar 2018 10:52:10 +0800
Tag:    v3.3.6

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

commit bc360e9441e50261259a79d22834074e062ba4ab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Mar 2018 10:32:29 +0800
Tag:    v3.3.6

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