Git merges in Moodle 3.6.0 by Jake Dallimore

commit 9e854122472b5f66f6617a748a916af395e2fe6a
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 29 Aug 2018 12:33:29 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63165-master-fix' of https://github.com/andrewnicols/moodle

commit 8981ac01974bae4f59a7de47c6198675f14b2821
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 29 Aug 2018 09:30:07 +0800
Tag:    v3.6.0-beta

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

commit efbbbf33735a192bbd79b1615eb39676686ce3a0
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 28 Aug 2018 16:55:07 +0800
Tag:    v3.6.0-beta

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

commit 240f437a4de929ddee48aa502de8c26a4f2af647
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 28 Aug 2018 08:47:43 +0800
Tag:    v3.6.0-beta

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

commit a37a616213cc568a44da0d53440eccac87bd882e
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 23 Aug 2018 08:20:13 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-57281-master-fix' of https://github.com/andrewnicols/moodle

commit 805ce3de79f7bdf3bf5dc5b52cceffa6fe3e4422
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 21 Aug 2018 16:04:17 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-36255-master' of https://github.com/lucaboesch/moodle

commit e9f1946ca1af6f95ac0ed5e20886701971d03753
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 21 Aug 2018 11:43:56 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62534-master' of https://github.com/mackensen/moodle

commit 463881978011fef7225ffa41a4f891db90ac05a8
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 20 Aug 2018 13:51:50 +0800
Tag:    v3.6.0-beta

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

commit 88dc63c335a7ce5cd4663029c0c62591c4b43772
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 20 Aug 2018 10:11:49 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-57741-master' of git://github.com/cescobedo/moodle

commit 215ecb017ab944d4436f3a8deb78e095f67f0e71
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 17 Aug 2018 16:02:05 +0800
Tag:    v3.6.0-beta

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

commit 71926adb0d5a9f1467e2119ee3dd5b928c13fb88
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 15 Aug 2018 10:59:37 +0800
Tag:    v3.6.0-beta

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

commit ed9d61ef4aec40c9c85d8292ba106f2afd252d0f
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 14 Aug 2018 12:11:25 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-63031-master' of https://github.com/prg3/moodle

commit e99564e51bdf36261d385c16e64a57d57b0ec23a
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 13 Aug 2018 16:02:54 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-60114_master_radio-option-choose' of https://github.com/awagner/moodle

commit c6150f1104572cd72c3bba392b3bb38483adc38e
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 16 Jul 2018 10:11:40 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-45389-master' of https://github.com/lucaboesch/moodle

commit 856602d992c3c542ce0c1139f05a9f95de4b0ae2
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 13 Jul 2018 12:26:05 +0800
Tag:    v3.6.0-beta

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

commit 98a09721d7cfdde44f8870114b847e4e4768ea6e
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 11 Jul 2018 09:02:15 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62712-master' of https://github.com/HuongNV13/moodle

commit 793fe5fc4cc5dafb41bb47cdaf367cd2461f97d5
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 10 Jul 2018 08:59:34 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62772-master_always_show_disclosure' of https://github.com/jmcgettrick/moodle

commit 31431602045ee66f038d6660234c2e138904a336
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 09 Jul 2018 15:46:25 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62180-master' of https://github.com/lucaboesch/moodle

commit 545a1382aa9174c8473af3da486cb931c614a0d2
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 09 Jul 2018 12:10:33 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-61359-master' of git://github.com/mickhawkins/moodle

commit 523662f1411f89e8d19f285d4e772af174cbc9fd
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 05 Jul 2018 09:25:41 +0800
Tag:    v3.6.0-beta

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

commit f84e9c4ead21de40d445dfded974802f524cf1a1
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 04 Jul 2018 16:40:29 +0800
Tag:    v3.6.0-beta

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

commit 9dc7f25f9f88cfd14447aba9c4041c4b025d8ff8
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 04 Jul 2018 14:37:14 +0800
Tag:    v3.6.0-beta

Merge branch 'wip-nolink-bug' of https://gitlab.di.unito.it/rabellino/moodle

commit a2e64810d4dfcec87551c0f66d0eb082cb03c19c
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 04 Jul 2018 12:59:00 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-41463-master' of https://github.com/lucaboesch/moodle

commit bbaab1bae77704afd103342580b47e47a1bbec31
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 04 Jul 2018 10:50:25 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-44081-master' of git://github.com/zig-moodle/moodle

commit 7eb7e4b9ea02be35dda18af219d69a6643a41d66
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 04 Jul 2018 10:44:51 +0800
Tag:    v3.6.0-beta

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

commit 83e2051845922428e1ec0b5d60965abbaa8888f1
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 03 Jul 2018 14:44:32 +0800
Tag:    v3.6.0-beta

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

commit 25a592ff5fec94045af25b1a0b25f6a0169f4af4
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 03 Jul 2018 08:49:35 +0800
Tag:    v3.6.0-beta

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

commit 221a79361a944183a2021454e2aa3e4ca2257ea1
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 02 Jul 2018 16:18:23 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-62801-master' of git://github.com/mickhawkins/moodle

commit 2bffba3cb6790e989064e67ee39f04396c98e671
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 27 Jun 2018 12:17:48 +0800
Tag:    v3.6.0-beta

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

commit decd90e2a3a038c4373bb687d9dbf02d7ae68218
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 26 Jun 2018 15:26:21 +0800
Tag:    v3.6.0-beta

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

commit b345895a9d9fdb1b0772739b7eda82c18c82ba55
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 23 May 2018 10:01:08 +0800
Tag:    v3.6.0-beta

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

commit 6ef703d8a6b1578b9d04f8a8733821ad45a93833
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 22 May 2018 08:14:52 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-61015-master' of https://github.com/lucaboesch/moodle

commit ed00590ad87bcf034e4c83cfc3434192345dc75f
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 21 May 2018 14:55:16 +0800
Tag:    v3.6.0-beta

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