Git merges in Moodle 3.3.x by Andrew Nicols

commit 01e64f89c76bae58c63a8c8ad58c86f3a1d63bc9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 09 Nov 2018 10:53:48 +0800
Tag:    v3.3.9

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

commit bb560c701250b6aa49416d9b20ff0d62846e334c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Nov 2018 09:57:19 +0800
Tag:    v3.3.9

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

commit 3cda2cab0ecc7332d0909b3358576cef224b22a2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 30 Oct 2018 11:00:43 +0800
Tag:    v3.3.9

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

commit 12963c14605a8a1600e6669cc0074598703d0bfe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Sat, 27 Oct 2018 19:30:23 +0800
Tag:    v3.3.9

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

commit 33adcf99267a77324cacea77ab464ac5ae59d608
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Oct 2018 08:56:20 +0800
Tag:    v3.3.9

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

commit 371168e84862ff36b25d8ea021bb87c5ea9c9599
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 25 Sep 2018 09:13:44 +0800
Tag:    v3.3.9

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

commit 19a94ef9239e91cf0aeed251ec7118a81816a07a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 22 Aug 2018 08:05:03 +0800
Tag:    v3.3.8

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

commit 1d5b6e94ee37f81810920e3181cc1aca68cc261c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Aug 2018 11:14:34 +0800
Tag:    v3.3.8

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

commit b3865f159b0670a084343ed78f96faa1056f3944
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Aug 2018 08:56:15 +0800
Tag:    v3.3.8

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

commit b76d7083159a778c29199d4ad70262ae6e60cede
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 13 Aug 2018 13:55:20 +0800
Tag:    v3.3.8

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

commit d54b8bb7eeee64f57d60b92c6bf813de14b117a8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 10 Aug 2018 08:46:57 +0800
Tag:    v3.3.8

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

commit a36a6e4491eb0aa78fe6ce125d450e35aa6bf833
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 07 Aug 2018 12:14:25 +0800
Tag:    v3.3.8

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

commit 1f44dfad424c674734eb3a8cb38b4cba71b82f7a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 03 Aug 2018 11:30:16 +0800
Tag:    v3.3.8

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

commit 5204184a9b5982e77c06c52e6527ed117f60e668
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Jun 2018 09:10:48 +0800
Tag:    v3.3.7

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

commit 5aa514982d049e01cdf096ea301ec908a425261b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 28 May 2018 08:55:24 +0800
Tag:    v3.3.7

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

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

commit 1cf00cde929f7fadacd788ecec7883109c87b6cd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 14 Mar 2018 10:34:09 +0800
Tag:    v3.3.5

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

commit d8952802e720f3364b0a600df602910099a14259
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 13:55:25 +0800
Tag:    v3.3.5

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

commit 7a49ac3d791bf59b99dd384de312c248c43e9a50
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 12:59:47 +0800
Tag:    v3.3.5

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

commit 1983c8395711ff2a2c83a8bf0d393e54b5ca9fd3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 12:21:36 +0800
Tag:    v3.3.5

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

commit 0534fbc2aae802aa4eef1733a8f2ea46abe02754
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 12:26:48 +0800
Tag:    v3.3.5

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

commit 5b9f872429e6d64b4ed0eab28524b774a4418e57
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 12:08:07 +0800
Tag:    v3.3.5

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

commit dd6789815279a9e8e2760abe109ec64957c3dbbc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 11:52:31 +0800
Tag:    v3.3.5

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

commit 5c07c79657594344d2de6a4452b3ed16eb376dca
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 08 Mar 2018 15:30:36 +0800
Tag:    v3.3.5

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

commit 9f11f13ad8d17c4fde06fbc2ba0d5002c0d4767a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Mar 2018 11:37:45 +0800
Tag:    v3.3.5

Merge branch 'WIP-MDL-60658-33' of https://github.com/chkhanu/moodle into MOODLE_33_STABLE

commit b091c290bb1822ba884aa3c05b33e8596751670d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Mar 2018 10:58:24 +0800
Tag:    v3.3.5

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

commit c101a623d84af3e0d68f7f3cae7e9f90bedc31ff
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Mar 2018 10:28:49 +0800
Tag:    v3.3.5

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

commit 253fcd9ce25c00acabb4132905c8d20662fb76df
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 02 Mar 2018 10:03:58 +0800
Tag:    v3.3.5

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

commit 8fda9b0267ffef5fb3388a598ab4be6ec2fe1871
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 02 Mar 2018 09:35:03 +0800
Tag:    v3.3.5

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

commit 5fc058c0b0c0bddf0eb9deeca2d00dc1027fdb9d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 01 Mar 2018 08:46:44 +0800
Tag:    v3.3.5

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

commit b4a4b7ce704df567ad0fcb397ba6d35db74b52eb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Feb 2018 14:12:04 +0800
Tag:    v3.3.5

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

commit d6e63cb6027dbd25385a1408448ace8016041414
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Feb 2018 10:27:56 +0800
Tag:    v3.3.5

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

commit 504e36da8ec5a8d5cc3206794d57272e207c3dfe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Feb 2018 10:19:00 +0800
Tag:    v3.3.5

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

commit 2eb83b76788ee7e231a431f2b8caea075cab58d2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Feb 2018 11:38:28 +0800
Tag:    v3.3.5

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

commit a3e647dc9835f8155892b18fed5e322128192f02
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Feb 2018 11:26:31 +0800
Tag:    v3.3.5

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

commit ff1f2393817ef242d6de735e5492502ffd85564a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Feb 2018 09:08:00 +0800
Tag:    v3.3.5

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

commit 41275ea77985186fbd24f47cb05f996be3b96fb7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Feb 2018 09:04:45 +0800
Tag:    v3.3.5

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

commit e129c4733bc285751736c12ed300c223100c401c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Feb 2018 09:02:53 +0800
Tag:    v3.3.5

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

commit 8e2eb1f335dd8a7c58c202833eed2bc18666b735
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 15:26:39 +0800
Tag:    v3.3.5

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

commit ea61136232f7bf19b6685320a557b16aed843bd1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 11:32:10 +0800
Tag:    v3.3.5

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

commit 6dc3fc7508163818276d35c7a383b8303b9ee6c5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 09:09:08 +0800
Tag:    v3.3.5

Merge branch 'MDL-61305-m33' of https://github.com/sammarshallou/moodle into MOODLE_33_STABLE

commit e53bde7de24102be7fa767ae8adf9d2690c9bbe1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 08:09:09 +0800
Tag:    v3.3.5

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

commit 9d8c7eaaa84e555017527de4358bc67cb330bad0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Feb 2018 12:53:02 +0800
Tag:    v3.3.5

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

commit 38055cdb22cb3f52d6fdc0919816c31358f468ea
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 17:53:30 +0800
Tag:    v3.3.5

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

commit b3c71b12c754e1f6769c087d97085d6f21961152
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 15:58:30 +0800
Tag:    v3.3.5

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

commit 9b2b1b5b12a663b09afb7e5177bbe12575a3964c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 31 Jan 2018 09:16:25 +0800
Tag:    v3.3.5

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

commit 859e9b3394d592b517d88c09ef3d8482d404e1f6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 13:28:50 +0800
Tag:    v3.3.5

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

commit 9aae08cc38131200ccc21db198822764ef513a38
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 11:26:56 +0800
Tag:    v3.3.5

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

commit 274d3ca6d52de63920859f5fb81e5b81e5de5c9b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 25 Jan 2018 15:14:29 +0800
Tag:    v3.3.5

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

commit b1c1aa89ed369e7377e03730f41fec6322bfccf2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 22 Jan 2018 11:31:15 +0800
Tag:    v3.3.5

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

commit 0de71f94324ed0dcc51e0c64d3292b5a38e528de
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 18 Jan 2018 12:47:54 +0800
Tag:    v3.3.5

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

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

commit 77952f9b6f5edc8ced96e17d5dfe5934c82dbd95
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 10 Nov 2017 11:50:03 +0800
Tag:    v3.3.3

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

commit edb84bc356c180a6756dff56ca9dc29530d9dc44
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Oct 2017 09:15:40 +0800
Tag:    v3.3.3

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

commit f649aafd9843179ec924f764737624cbe9efec16
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Oct 2017 08:20:05 +0800
Tag:    v3.3.3

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

commit 1f236c90b2db2dddca7e59a414f670ef555e84dc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Oct 2017 10:50:52 +0800
Tag:    v3.3.3

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

commit 944520fd81092ac6178410746dc0b99623ae6570
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Oct 2017 09:20:05 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_STABLE_MDL-60360_enable_file_indexing_retroactively' of https://github.com/mattporritt/moodle into MOODLE_33_STABLE

commit d6b67e26e36f989ac351728c0afc31f008de110f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 14:32:12 +0800
Tag:    v3.3.3

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

commit 0a12ba0807fcd7b619ccdebe1f72d7e9bb3b62b7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 14:05:52 +0800
Tag:    v3.3.3

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

commit 6188594b5270a95cdf026fb4bc55f0a0a5530210
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 13:18:39 +0800
Tag:    v3.3.3

Merge branch 'MDL-60535_33-questionbank-button-styled' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 0afcdafdbc253cf30c9e1c5cbd383c56ea309b30
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 11:38:28 +0800
Tag:    v3.3.3

Merge branch 'wip-MDL-60104-m33' of git://github.com/amygroshek/moodle into MOODLE_33_STABLE

commit 0de940286f45cb16e223c4f1070e056592974b34
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 11:30:32 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_MDL-51892' of https://github.com/fwsl/moodle into MOODLE_33_STABLE

commit 82938bb56296652dad4b6f90e6eceb9ff2876558
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 25 Oct 2017 07:12:21 +0800
Tag:    v3.3.3

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

commit 92126f2ea8d958173c017ca676ad89fa391d29bc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Oct 2017 12:50:41 +0800
Tag:    v3.3.3

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

commit 729ada251be56555acdc8357916eed16d2676431
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Oct 2017 08:08:27 +0800
Tag:    v3.3.3

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

commit 83a6957d2e348848c0f0cdb8d2140a2a6eb0aea2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 23 Oct 2017 20:27:16 +0800
Tag:    v3.3.3

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

commit 1c6b0718be38047fc898ab83e90bd12e9c6054e1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 20 Oct 2017 10:28:45 +0800
Tag:    v3.3.3

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

commit 6475e2cb5e8920bab2d55225871eb4d6aa32dbee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Oct 2017 11:29:20 +0800
Tag:    v3.3.3

Merge branch 'MDL-60319-MOODLE_33-google-converter-bug' of https://github.com/mspall/moodle into MOODLE_33_STABLE

commit 0be75ddb9957c5714a33e84e468a53b59eec8dfb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 Oct 2017 09:39:50 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_STABLE_MDL-60276' of https://github.com/CengageEng/moodle into MOODLE_33_STABLE

commit 67a41913807fc9df5c18410f77307f780a361753
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 09 Oct 2017 14:10:08 +0800
Tag:    v3.3.3

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

commit b278d3299973e710b73e11a29bebe5cb347031c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 03 Oct 2017 10:33:32 +0800
Tag:    v3.3.3

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

commit 7129db08e74e32359889b18ae5b0b3fbef8facc3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 02 Oct 2017 15:40:22 +0800
Tag:    v3.3.3

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

commit f009ad959ad7f73339518a9613fb896307d60cc4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 02 Oct 2017 10:17:25 +0800
Tag:    v3.3.3

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

commit 76ed5670624c53914861012278c1f8517b53f140
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 26 Sep 2017 15:48:07 +0800
Tag:    v3.3.3

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

commit 2c9e28d2b835f1efdb11d821859822d2c7404a70
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 26 Sep 2017 09:40:30 +0800
Tag:    v3.3.3

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

commit 620a05aa6af0ed5b1893d14983aada1687fa0ea2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 26 Sep 2017 09:26:10 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_STABLE' of https://github.com/ConnorSheremeta/moodle into MOODLE_33_STABLE

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

commit 524724c6423097201837174db8813196b921facd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 24 May 2017 14:18:58 +0800
Tag:    v3.3.1

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

commit d9c2abaa650c11deb8417a2a8e6eea95d809babd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 23 May 2017 19:45:24 +0800
Tag:    v3.3.1

Merge branch 'MDL-58577_33-statistics-report-header-multilang' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 63752139c4998c8d75ed33b4a10657cf8db05f49
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 17 May 2017 07:00:49 +0800
Tag:    v3.3.1

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

commit fbf216799c57a67b97735b8a487a73716547ed9f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 May 2017 13:52:45 +0800
Tag:    v3.3.1

Merge branch 'MDL-58756_33-statslib-roles-multilang' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 81432e74f4c284d8272f6009489a0ff4d37200c9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 May 2017 15:13:04 +0800
Tag:    v3.3.1

Merge branch 'MDL-58893-33-missing-div' of https://github.com/dmitriim/moodle into MOODLE_33_STABLE

commit 2c69d24037089c060b1937425aa4c1d676a2b5d3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 12 May 2017 12:32:23 +0800
Tag:    v3.3.0-rc3

Merge branch 'MDL-58898-master' of https://github.com/xow/moodle

commit d9d2c2f86f49f6a818f53dd672064f8649e05a13
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 12 May 2017 10:22:19 +0800
Tag:    v3.3.0-rc3

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

commit 865e2bc7dc09b018b3840c7f456fcd2ba1764906
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 10 May 2017 11:48:40 +0800
Tag:    v3.3.0-rc3

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

commit 381db2fe8df5c381f633fa2a92e61c6f0d7308cb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 09 May 2017 13:55:20 +0800
Tag:    v3.3.0-rc2

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

commit 5d9c1b2f8eaa11595baccb7b2ed5786ce75a621f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 May 2017 12:30:59 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle

commit 1d5a3664888af0666f6dc3413f814243ea0b09a5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 May 2017 11:20:39 +0800
Tag:    v3.3.0-rc2

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

commit 7167d25f5f494daadad395f5b82473ff58ab05f5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 May 2017 09:32:58 +0800
Tag:    v3.3.0-rc2

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

commit 529d52f39a5d4e9b414b02734db63f653842e4ca
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 05 May 2017 14:55:22 +0800
Tag:    v3.3.0-rc1

Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle

commit fbc15bb977523b3a990f93e7c7d947ac3e0b5bb3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 05 May 2017 09:57:40 +0800
Tag:    v3.3.0-rc1

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

commit c428f58a3abd093be6dabc856981b9c16dbde7b7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 05 May 2017 08:26:26 +0800
Tag:    v3.3.0-rc1

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

commit 5e7de08be505246c0417c8190b95f38997565830
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 05 May 2017 08:23:27 +0800
Tag:    v3.3.0-rc1

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

commit 6628153eb348cef0afb298ba9ca2cea445265948
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 14:33:27 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle

commit 641af8d17ce7478dd23c42af45a5a202498712c4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 14:11:23 +0800
Tag:    v3.3.0-rc1

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

commit 2e3c23b25f27727115c7266d4ec79d5d09160113
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 11:42:38 +0800
Tag:    v3.3.0-rc1

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

commit f8633212ee386123c76248e94551e6b755c71907
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 11:07:37 +0800
Tag:    v3.3.0-rc1

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

commit edf1ea10ca701643e94ff49a9dfdf392b8a7499f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 11:01:39 +0800
Tag:    v3.3.0-rc1

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

commit 680ad78cf074387dbb3834e98a70c7a9460715c9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 10:14:41 +0800
Tag:    v3.3.0-rc1

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

commit b1517237ad3da5ad872a5916aa074ac9d2c9b785
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 08:49:48 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle

commit 4270ebea382a493b140e7a301322adbe5158ea75
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 02 May 2017 10:35:46 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-57704-master' of https://github.com/xow/moodle

commit db2c66e700e44b4f07f0d0fa9eb2ec099a9cac66
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 02 May 2017 09:00:07 +0800
Tag:    v3.3.0-rc1

Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle

commit 2a87d81c5a0203e5de7badb3d77e7e293bb6599d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 01 May 2017 15:22:53 +0800
Tag:    v3.3.0-rc1

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

commit 8374422402e52afa749c627cbce3ccc7736585b8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 28 Apr 2017 11:46:02 +0800
Tag:    v3.3.0-rc1

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

commit e6c0e75ed8d58aa59eba16dd251ecda3116447dd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 28 Apr 2017 10:29:50 +0800
Tag:    v3.3.0-rc1

Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle

commit ae068eb1454851e638f65bc8676ca77b1d624d12
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 27 Apr 2017 13:55:02 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58644-master' of git://github.com/ankitagarwal/moodle

commit 14ed05c0dcce39c01815244de00fdcd9acca342f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 27 Apr 2017 11:25:35 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle

commit 7125b4f17c89969aa8ec279c3146438bbe102431
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 21 Apr 2017 10:39:41 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle

commit 470781609590fed14ed17e1001a34b141ab753d9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 21 Apr 2017 08:52:15 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58490-master' of git://github.com/lameze/moodle

commit e44400ceca7a61a562c6f7d192a8b946d56609f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Apr 2017 15:23:50 +0800
Tag:    v3.3.0-beta

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

commit d1131cd8b6058bd9d78e038d4b8c7ca505be078f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Apr 2017 13:54:43 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-58138-fix' of https://github.com/marinaglancy/moodle

commit 9517ea662d575328872b4b8f7dcb33a04dd272a1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Apr 2017 13:03:34 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle

commit d41402a046883ec5028895693d63c7a84573504d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Apr 2017 12:58:48 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58370-master' of git://github.com/damyon/moodle

commit 5ca4dbe6f635cc0c6f47ed66e70120bc418fc53a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Apr 2017 12:38:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57456_master-fix' of git://github.com/dmonllao/moodle

commit 07e5b34c955637c72793a6a26373de83f33e045d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 19 Apr 2017 13:50:28 +0800
Tag:    v3.3.0-beta

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

commit 442908a1000e1815aa3f4c51fb3624be3694130d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 19 Apr 2017 11:53:40 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle

commit a1b98c934c7f33475bedafc42967223c49ea5e7a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 10:23:03 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58551-master' of git://github.com/lameze/moodle

commit 2660f7dabec4ce75bf7c27d02150e733a7d33ec4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 09:42:36 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle

commit 80483bf3ccbb03ceff8479a32ceb864d43e77718
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 09:20:10 +0800
Tag:    v3.3.0-beta

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

commit d4be750a7ccf82a9bd8a053fe23e1272cc42f147
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 08:41:59 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle

commit e4a090c1056829262806f97cec8e0c5ac163b2c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 13 Apr 2017 13:21:42 +0800
Tag:    v3.3.0-beta

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

commit 20026ab3c163bc596c2f79f05c5784b54f55aec7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 13 Apr 2017 12:10:45 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle

commit 270d5c1cc5e738360dc992917a33fb7523c4d8b0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 13 Apr 2017 10:00:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle

commit 28b966a5f9a40c0974bf24aaef3a62f31fdfc23d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 13 Apr 2017 08:44:15 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle

commit 4041ac0c4dc38e1c05f175b308ade73e66b4a174
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 13 Apr 2017 08:36:20 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58537-master' of git://github.com/damyon/moodle

commit 1ad2ff0404127911b9d6ac268b799e587fd3314b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 11:51:59 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57616-master' of git://github.com/marinaglancy/moodle

commit 9b18c0e075beb71912c9e838e7ef1a46723fae20
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 11:15:32 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58461-master' of git://github.com/damyon/moodle

commit f669ad5ca75b15770c6582b44debce800a136b31
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 09:46:04 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle

commit 23605e9fbc103a971961a553da8617c36efa5527
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 08:57:30 +0800
Tag:    v3.3.0-beta

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

commit 18baa6c9566116f7688ffb848360f7edb9dac333
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 08:43:36 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle

commit 137ea0572da07803b1360c0076827c42890dfdc7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 13:37:06 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-58180-master' of git://github.com/marinaglancy/moodle

commit 17cc2842a774e53a8be589df6ace90c45a592c38
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 13:35:36 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle

commit 3afd529013d5860faaedde8ce777174814fa3748
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 13:20:13 +0800
Tag:    v3.3.0-beta

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

commit 04e45e8e25b0b4380d1aaad0965dfcd76cce9270
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 13:16:29 +0800
Tag:    v3.3.0-beta

Merge branch 'master' of https://github.com/tniessen/moodle

commit 3de074e4bf455e1cbd033cbe139efe35204ae743
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 12:00:59 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle

commit 1adae8544816907f2093f768cb51049096940237
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 11:54:09 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle

commit b140b13c251a0574d3b5ace5945a7be6cd42e4ee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 11:23:37 +0800
Tag:    v3.3.0-beta

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

commit ffc4b7e4af3b78a51da4991ebe766d7b5bb80993
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 06 Apr 2017 13:24:05 +0800
Tag:    v3.3.0-beta

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

commit 97f17c049058572fb59a72c5feed11b766973bb4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 06 Apr 2017 11:54:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58220-master-fix4' of http://github.com/damyon/moodle

commit 3e577638332a87a3f7c4c48cae536e24acd461a0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 06 Apr 2017 09:02:36 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle

commit 00aa58eb5fc8e134c5d58fd0ad214e73ad508b1c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 15:49:49 +0800
Tag:    v3.3.0-beta

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

commit c254588732175ea8d2f17ee365adce44d18e6252
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 15:19:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58361-master' of https://github.com/xow/moodle

commit c46ae2fbc113a843359294bb1b8d20a7a7f37662
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 15:04:44 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58361-master' of https://github.com/xow/moodle

commit 3aa424703b95a10d98cabc8c84f9fb9cee52d749
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 14:43:13 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58220-master-fix2' of http://github.com/damyon/moodle

commit 941cb7ce3c0692f6ec9a819630c0c6db081caabc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 14:22:39 +0800
Tag:    v3.3.0-beta

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

commit 2a44422e54c6314d991e3d1328354f7dd128fdeb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 12:56:01 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle

commit 038db9734f3dc5f2895b718f07ab94426e0aa9f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 12:29:13 +0800
Tag:    v3.3.0-beta

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

commit e31dba2c8ded05daacdbf19b5d608c1ae2277b27
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 11:13:31 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-12689_master' of https://github.com/markn86/moodle

commit 04056e715b5f560312bc8c5efd3a1d7b6eb8de69
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 05 Apr 2017 09:56:29 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-51998_master' of https://github.com/nadavkav/moodle

commit 930cab683d5bc5f9dab6f835bcb71fa464329248
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 04 Apr 2017 11:48:50 +0800
Tag:    v3.3.0-beta

Merge branch 'master' of https://github.com/koennys/moodle

commit a9bca28400da360d68a4f622e93988c610203cfe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 04 Apr 2017 10:43:41 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle

commit 23f1f5211ef56b7db7fdb2acf5cbd4b048f98994
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 04 Apr 2017 10:37:26 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle

commit 6fdf167b0f2c9dd4e3accd951faeaf874d2ebc5d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 03 Apr 2017 15:38:53 +0800
Tag:    v3.3.0-beta

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

commit 3d85d1685d43126c1e582784b96b40845b24a35e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 23 Mar 2017 11:51:50 +0800
Tag:    v3.3.0-beta

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

commit 85ead19b34a241488fd9b366ef1c3c433d83a328
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 23 Mar 2017 11:33:11 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-40759-master-fix3' of http://github.com/damyon/moodle

commit afc8dc90fc446b1576de11de0449e75a784a1b5e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Mar 2017 11:31:26 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-40759-master-fix1' of http://github.com/damyon/moodle

commit 2154c9824d6231ad084b6e65e6cd7b15f92a663d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 20 Mar 2017 13:57:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle

commit 640b8efad85ca2e4b54e3c7f5568d6b08f97ec20
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 20 Mar 2017 08:16:07 +0800
Tag:    v3.3.0-beta

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

commit 9c2ca400417f5f1b3654d19966a5848d456298ba
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 16 Mar 2017 07:58:08 +0800
Tag:    v3.3.0-beta

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

commit eb6f04732aaa1b8a061c8d073a4cd4e836801796
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 16 Mar 2017 07:39:48 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57913_auth_db_sync_task_master' of git://github.com/gthomas2/moodle

commit 6fcdbc79121dded630b9e7070dd0caf971251cfd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Mar 2017 14:44:17 +0800
Tag:    v3.3.0-beta

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

commit 5fba3bd7af3461cd301aa93b2ce359d356c77fb6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Mar 2017 14:31:49 +0800
Tag:    v3.3.0-beta

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

commit 484eeebc4866c2f04aae36a87fda7c05aed7f4c2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Mar 2017 11:42:28 +0800
Tag:    v3.3.0-beta

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

commit ef452d9cbc3ab45d5a0d1692c5d6c18e8bba5251
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Mar 2017 11:17:49 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-47354_gradereport_singleview_perpage' of git://github.com/davosmith/moodle

commit 594ada13c23e82835e705d6f4484a1647f5e18a5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Mar 2017 13:31:43 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57751-master' of https://github.com/xow/moodle

commit ada10e7c185c3a8a616ab41892e6463396910618
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Mar 2017 12:28:52 +0800
Tag:    v3.3.0-beta

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

commit 224853595c255d880bf424bdf994bb007dbc141f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Mar 2017 12:10:56 +0800
Tag:    v3.3.0-beta

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

commit 0c6435838a88b456dfaed2ab179e5821ce239ad0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Mar 2017 11:25:01 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-58250' of https://github.com/rajeshtaneja/moodle

commit 4c6edf9dd8f811a5a0e75d23206a55eea5f539e5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 13 Mar 2017 08:40:45 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-51853_m33v3' of https://github.com/sbourget/moodle

commit aabe41f35997ffa053659b1cf7dc323d1c2cd5da
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 10 Mar 2017 12:18:20 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle

commit 5286837617974454c4e13e69c74278cf4500aca7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Mar 2017 16:32:33 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle

commit ef607980cfb11e37c5562f3c33e3181cafadd136
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Mar 2017 15:59:25 +0800
Tag:    v3.3.0-beta

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

commit c742c61956449d7fc4b335421f9f7cddc62cfdb1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Mar 2017 12:02:17 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle

commit e2310e4361b244813d8698cdfc79ba4f3b8792a1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Mar 2017 11:54:24 +0800
Tag:    v3.3.0-beta

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

commit 0c90bfe39bde89f51bd2d55ec25b9624461b9d4c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 07 Mar 2017 14:35:00 +0800
Tag:    v3.3.0-beta

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

commit 342af35ab8c755a903590cd6b3f17eacf90958c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 07 Mar 2017 12:07:50 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle

commit 7b0a41447aa17d0af13eaa555e0d71a7e31ee1b0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 01 Mar 2017 11:09:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58072_master_tabtree_mustache' of https://github.com/mchurchward/moodle

commit e890de55313819437ec0d7ab5a8f7dc7817a93ae
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 01 Mar 2017 09:31:45 +0800
Tag:    v3.3.0-beta

Merge branch 'm33_MDL-57789_Add_Cache_Control_Immutable_Support' of https://github.com/scara/moodle

commit b6cab2b50515d15fdc48eb541625f2bd7d6dd3b1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Feb 2017 12:19:33 +0800
Tag:    v3.3.0-beta

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

commit 3c395fe4865c380fd15f20a0a5aa5a5e3e585118
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Feb 2017 10:33:40 +0800
Tag:    v3.3.0-beta

Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980-master' of git://github.com/snake/moodle

commit d28357fbca36229652c96360b1e4c4d8cee8e743
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Feb 2017 09:43:14 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-55547-master' of git://github.com/marinaglancy/moodle

commit d9a5f820861a71a8c36600ca03787ae358e245fd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 15:20:28 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle

commit 71cc1e529d8670ac19330705a92e9f822f178a3b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 13:42:55 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle

commit 696099b94f662fce70808ddeee1808b57d4087b5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 11:58:23 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-35980-master' of git://github.com/snake/moodle

commit 50d567767cf64bca3ad15fda92cd317f4fcd3617
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 11:45:30 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle

commit eccbea3dd0042fc6f3fed2d6fe67aaca10e93b8e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 10:40:21 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-33483_m33v2' of https://github.com/sbourget/moodle

commit ea6eb1cc482b71bbfb1915dd0346442cc1e5e16e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 02 Feb 2017 09:18:17 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle

commit 22f93579fa7c08e13705f3170dff7cbade0f33ea
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 13:21:35 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57638_rss_skip' of git://github.com/davosmith/moodle

commit 7a2121d7f2847b694035668f1115786595d2326e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 12:19:13 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle

commit ca12fb5458be2325d5d4e0b376c5c16c5f1ba978
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 12:10:48 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle

commit 88107dc944b206557c4b0985d03258f36557ca22
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 11:43:38 +0800
Tag:    v3.3.0-beta

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

commit b462c655dcfddab8a7d0ffb7d80bf42ee2aa1177
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 09:00:34 +0800
Tag:    v3.3.0-beta

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

commit f417416cf11631b14109aca0fdddeaecf4709bd6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 08:35:41 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57296-master' of git://github.com/ankitagarwal/moodle

commit 746372776104c548dc67602c52cb24053985265a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Jan 2017 13:56:16 +0800
Tag:    v3.3.0-beta

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

commit ae099a2a1dbaa2dc78d48bc6afd49f571d883288
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 25 Jan 2017 08:48:27 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57273-master' of git://github.com/damyon/moodle

commit 34dc92849f7116192ab3e805f7e5a37c9b3186a7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Jan 2017 14:57:53 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57550-master' of git://github.com/danpoltawski/moodle

commit d68d5ce33740449a623ff089847d58143a026277
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Jan 2017 13:26:47 +0800
Tag:    v3.3.0-beta

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

commit 6b8e5ce30787843ef94d4900b580efa3108e2bcb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Jan 2017 13:01:45 +0800
Tag:    v3.3.0-beta

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

commit 214eef2e1aef63eea02a4191bf3a3e38ae485274
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Jan 2017 08:47:54 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle

commit 80409ac1b5254d5a58b5a28a9a605185e1338042
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Jan 2017 12:17:44 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 22f1426b447a00c079152a8e07a44d0e12d53cab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 16:00:06 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle

commit 93c15c77d777897930afc7e04c68258b2333c459
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 12:51:59 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-45821' of https://github.com/rajeshtaneja/moodle

commit 81c226d451017aa5e560a3a3c788a2da55f41bdb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 12:36:45 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle

commit 40566af6d5b70d033ecaf2ab0c477d0277132fe1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 12:09:20 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle

commit 3dc330593694eb117b14ff499c19f5049acc1150
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 08:36:58 +0800
Tag:    v3.3.0-beta

Merge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward/moodle

commit 2156bb454cd6e52f5cf619d8cd313f4202118b8b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 07:46:02 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle

commit 703b6debe62445aa1c1210a1454dee725acdbb88
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 15 Dec 2016 11:34:48 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 374d7af2ebffa1dde3c322408e89b978c85e6b58
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 14 Dec 2016 09:55:34 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle

commit 428e18ed2b9fbd8737be49b6d3667f733e532c37
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 14 Dec 2016 09:26:10 +0800
Tag:    v3.3.0-beta

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

commit 01c7c3d8fb347675ee3b4c19432b90f0cb30fb8b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Dec 2016 13:06:18 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle

commit 08f96ac9d718d7e9d4e6ba6672bfeb5774dd9585
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Dec 2016 10:37:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57056_master' of https://github.com/nadavkav/moodle

commit 106c8026d1c75adc42dab25f288ecf8e65157a3e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Dec 2016 10:25:30 +0800
Tag:    v3.3.0-beta

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

commit c8c3df53bb9d5f0e14bb4c09ee486c5725119249
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Dec 2016 12:51:19 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-46714-master-nadav' of git://github.com/FMCorz/moodle

commit d52a665eea619fe2106d4b9c0729a477bde56f0d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 08 Dec 2016 13:50:34 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-56614-fix2' of https://github.com/marinaglancy/moodle

commit 64ad7319abf4a4e5fb7d6a090a71ab247093b7d2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 08 Dec 2016 10:44:49 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57278-master-5' of https://github.com/xow/moodle

commit 86f4236cc250b087df80522cff69fcdc28a0f567
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 14:56:49 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle

commit 4b2bcd2376e1cbdcade1e9ec18bab660d33c5c98
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 11:53:34 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle

commit e4621f077580d18c4d051ee4928ec212df3ccfd6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 10:00:30 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle

commit 75af0aa680ad1b6aed2135d891d382595f4e47bf
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 09:53:16 +0800
Tag:    v3.3.0-beta

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

commit 3e9f3e30b2bc5940e1186a1e0082998ee8897098
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 09:50:16 +0800
Tag:    v3.3.0-beta

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

commit 3b8cf77689cc6ba9bf8a6c522daf4e35d13dc22e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 09:42:20 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle

commit 00f6e2cc52f1c926e7682cdf25debc535dd94480
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Dec 2016 09:00:22 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57137' of https://github.com/rajeshtaneja/moodle

commit 3bb4ad75215f05de425abc00ae5fbdd216baf1d7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 14:52:32 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle

commit afecb4dfd511b558e51fcbc3a27d1b6ce7a240e2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 14:34:06 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle

commit 7586a360226042a50ccf1a70625a4acc2c4945c5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 14:10:40 +0800
Tag:    v3.3.0-beta

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

commit 5b67c9ecd173a51c640b93cbaae5b58fc81b47fe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 13:37:33 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle

commit f3666a1a56c113b55e77b3c00b16b444e4f8f6ff
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 13:06:39 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57161-master' of git://github.com/lameze/moodle

commit 80a35e6d1fa6116d8d8d5048bafa8dbaf545e1c3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 10:16:38 +0800
Tag:    v3.3.0-beta

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

commit 2e0e081b609dcf5421a79d0565e4fbfb95d2486b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 06 Dec 2016 08:56:27 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56759-master' of git://github.com/lameze/moodle

commit 8e9cb9b1dd79a6aa6f4a2e9ae5b1400b2aff525c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Dec 2016 15:13:47 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-54921-master' of https://github.com/xow/moodle

commit 405666d3718d187041d52424ada812f7fff1f74f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Dec 2016 13:01:31 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle

commit 0dcbbbaa7eb728f2d98db2158b34dfa2f3405261
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Dec 2016 12:26:20 +0800
Tag:    v3.3.0-beta

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

commit feda939e2fa57821a2bdcbc6584d962835954ec1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Dec 2016 12:04:43 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56893-MOODLE_master-edit-grade-item-bug' of https://github.com/mspall/moodle

commit 8c71e91cdb0044dc54d88e229f0ed4358c5913c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Dec 2016 08:51:21 +0800
Tag:    v3.3.0-beta

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