Git merges in Moodle 3.3.6 by Eloy Lafuente (stronk7)

commit 1b70269f4ee9a91a543a61353607cd94ecf69cdc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 May 2018 23:29:24 +0800
Tag:    v3.3.6

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

commit d33d90031e0cf4e773c9d1a790faaf1f7e7646f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 May 2018 08:56:23 +0800
Tag:    v3.3.6

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

commit d567be0d04e13269bf049e412ee2a740e2d89118
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 May 2018 08:42:27 +0800
Tag:    v3.3.6

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

commit 98900443b70bd8572733098cd2cd5ac9a3661636
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 May 2018 05:58:26 +0800
Tag:    v3.3.6

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

commit 92928baabef5e5fff8c1325406dd69ab9bc0c751
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 12 May 2018 00:28:11 +0800
Tag:    v3.3.6

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

commit 7bf7b7e5177cb11927dd828abaa92e8c038a8e72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 May 2018 19:24:02 +0800
Tag:    v3.3.6

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

commit 7a797d3fe509dcc0405432fd7cf1ffe46939ab59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2018 17:39:32 +0800
Tag:    v3.3.6

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

commit c092051695dcb42d32a52dee8bdc4f9a873d269c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 May 2018 08:06:58 +0800
Tag:    v3.3.6

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

commit 94f42309c59f735af6f67e434b9b019ef1d6cad2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 May 2018 07:45:44 +0800
Tag:    v3.3.6

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

commit 99c76ad3ce56b508330e958bcbc32dc40b694da2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2018 21:42:11 +0800
Tag:    v3.3.6

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

commit cefc325958d9b9ac33389b2db71b105de9b6ab54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2018 05:40:57 +0800
Tag:    v3.3.6

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

commit 2886a5e64d7773ab14c16a66beac808e3f60f245
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 04 May 2018 05:29:28 +0800
Tag:    v3.3.6

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

commit 7e968c33f83b9926dfc3fbde8bc43ebe732aba37
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 May 2018 05:04:12 +0800
Tag:    v3.3.6

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

commit 46895a7b3dde1cd2846c4eec5f51d73489d6c0d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2018 07:39:05 +0800
Tag:    v3.3.6

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

commit 520cc4e6612e7759a7b62850087f7a3c477addf3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2018 07:30:36 +0800
Tag:    v3.3.6

Merge branch 'wip_MDL-62011_33_approval_of_course_request' of https://github.com/grabs/moodle into MOODLE_33_STABLE

commit eaecfd8d796155e2cf49a55b02d834e9afa78e91
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2018 07:01:36 +0800
Tag:    v3.3.6

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

commit 7dbc8221319b5cbf972b2472f7ebe00b841bd3e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2018 04:32:06 +0800
Tag:    v3.3.6

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

commit 86f3c6b22f2ff1c0030bff7e46abf5865d22f2f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Apr 2018 04:23:24 +0800
Tag:    v3.3.6

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

commit 6b003a5bc1649ee71032f9b08c2edf5758eadd56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2018 23:38:46 +0800
Tag:    v3.3.6

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

commit eb960618a167d5697780dd15836b8a134bc98530
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2018 09:09:44 +0800
Tag:    v3.3.6

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

commit 87aaec6c82911899fbf50bdb09271028c4616603
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2018 08:40:18 +0800
Tag:    v3.3.6

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

commit 2b33a8b518aedeadb0c871a394ae32cd09bb6ea4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 26 Apr 2018 01:09:59 +0800
Tag:    v3.3.6

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

commit 5f2fe216f0fa672de8304cf615a37899488ce91f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 20 Apr 2018 08:29:04 +0800
Tag:    v3.3.6

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

commit bf91ad7c8c9620a8d6653848285a07911bf79f36
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 20 Apr 2018 08:25:10 +0800
Tag:    v3.3.6

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

commit be960b40a0825200a5b1114fb671ea12a2bc0e54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 20 Apr 2018 08:18:14 +0800
Tag:    v3.3.6

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

commit a5ca61930d0354df817b9d7696dbbcdfcee750e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 20 Apr 2018 08:02:15 +0800
Tag:    v3.3.6

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

commit 5c4ff2db85845d69772ac7aa55743e26733e63eb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Apr 2018 18:58:59 +0800
Tag:    v3.3.6

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

commit c873339cc115aed01b12164be3f8ca64b76d84a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Apr 2018 09:08:35 +0800
Tag:    v3.3.6

Merge branch 'm33_MDL-59857' of https://github.com/danmarsden/moodle into MOODLE_33_STABLE

commit a8790124648c8727566c22cde389855223b69393
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Apr 2018 01:54:32 +0800
Tag:    v3.3.6

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

commit 6477811c56c777a6b6f37811129f9800594ec86a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Apr 2018 06:14:57 +0800
Tag:    v3.3.6

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

commit 0103da4a9720f3f80cf2c9bcb42735fa18d7562d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Apr 2018 05:58:34 +0800
Tag:    v3.3.6

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

commit 1475e116dfefb3f51a6848681b7a40fcc0418596
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Apr 2018 05:55:14 +0800
Tag:    v3.3.6

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

commit 00cb9fe1e19cb04f796011a480906578b3c3a6b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Apr 2018 21:54:26 +0800
Tag:    v3.3.6

Merge branch 'wip-MDL-58697-33-assigngrading' of git://github.com/adamann2/moodle into MOODLE_33_STABLE

commit 6e5876ca57a71f4aa9255efba9e58e9827e5a898
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Apr 2018 19:06:53 +0800
Tag:    v3.3.6

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

commit bc3e7588b91ba81101cfdb87cb30259dfb6321f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Apr 2018 07:01:17 +0800
Tag:    v3.3.6

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

commit 61ab947bd1cc2aba2642af3adf27a729d6e288be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Apr 2018 06:57:46 +0800
Tag:    v3.3.6

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

commit 3857876a58385ce0ecbcf90ac7ea4ae2fe6c377d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Apr 2018 02:30:41 +0800
Tag:    v3.3.6

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

commit 16c3e11c0d4d64a3d786752237e5d4bdb9d7dfbb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Apr 2018 21:38:06 +0800
Tag:    v3.3.6

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

commit 57d9e97c0047d14caf6f1cc828ac555642533a6a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 05 Apr 2018 07:10:39 +0800
Tag:    v3.3.6

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

commit a000775fed531e260602799326a37ee7e464e826
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 16:51:40 +0800
Tag:    v3.3.6

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

commit 742af6b3373c4296156d6e1a88f7759539916d58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 07:40:57 +0800
Tag:    v3.3.6

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

commit 11e04e1bd4a7634ff48c851dfc1ca9bfc7616722
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 07:23:22 +0800
Tag:    v3.3.6

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

commit e3bcf576b1132ff62aeba57ad1dfe7e7deed85b9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 06:46:43 +0800
Tag:    v3.3.6

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

commit a98506c8e48bc1ab12be52033522a5d88b0faad7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 06:35:20 +0800
Tag:    v3.3.6

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

commit 4853023e803f25bba4db4035a52165f859565e3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 06:24:08 +0800
Tag:    v3.3.6

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

commit 61ee905511af9da476a5b45c16f5b2145481e348
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 05:47:48 +0800
Tag:    v3.3.6

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

commit 04cfb8194aeb129b23e5dfb4adb17c4fe012b8d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 05:40:17 +0800
Tag:    v3.3.6

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

commit 623ee07cfe89e0e0007e580293bf82a424bb7c72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Apr 2018 03:46:41 +0800
Tag:    v3.3.6

Merge branch 'MDL-60115-Book-cancel-button-redirect-bug-33' of https://github.com/Moodlers/moodle-1 into MOODLE_33_STABLE

commit 036ab38556cb85e93e92ef23f18477e44a2ad89b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Apr 2018 07:17:35 +0800
Tag:    v3.3.6

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

commit 8dd32ca48bb561f52890348e1b409c6dc170ca2f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 Apr 2018 17:03:32 +0800
Tag:    v3.3.6

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

commit 085f325851a7ac5042f54ffec2382359206e4885
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2018 19:45:53 +0800
Tag:    v3.3.6

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

commit 6dcb3a16924bb077e3976af9e0745ba0064a5f05
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2018 18:45:20 +0800
Tag:    v3.3.6

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

commit 99c4c947fefe879f87247870d688a6cd738e980e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2018 07:43:11 +0800
Tag:    v3.3.6

Merge branch 'MDL-61248_m33' of https://github.com/ak4t0sh/moodle into MOODLE_33_STABLE

commit 57f1a4adc776414efbaa373e66f43f4243494712
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2018 05:26:30 +0800
Tag:    v3.3.6

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

commit 7c08cacca700d64f1450c33588efc0f031cf2d73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Mar 2018 05:15:28 +0800
Tag:    v3.3.6

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

commit 5bfbe050ee54d8049710a9322f52b06294d10241
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 22 Mar 2018 23:57:09 +0800
Tag:    v3.3.6

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

commit 7c9b564f3f4df66bb5c52a95f3bf0566152ea761
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 22 Mar 2018 02:38:13 +0800
Tag:    v3.3.6

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