Git merges in Moodle 3.3.6 by Jake Dallimore

commit decd3731df40c061d8f9f6d5fb48df536dfc6613
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 16 May 2018 12:02:54 +0800
Tag:    v3.3.6

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

commit ccc3f7071725a5ed407604ad96e0688ff04bfe92
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 14 May 2018 11:58:28 +0800
Tag:    v3.3.6

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

commit 2c5e158be137a5bf827723a9ca8c6a2c0e0882c8
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 14 May 2018 09:38:18 +0800
Tag:    v3.3.6

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

commit d1ec251117eecce90cc62308cb9ab84deb9bb105
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 11 May 2018 10:20:14 +0800
Tag:    v3.3.6

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

commit a5a7741d7c726df7d1a5d7a431ccfa9b178bfd92
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 10 May 2018 10:04:43 +0800
Tag:    v3.3.6

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

commit a3a8c5b244b7ceebea246cb6a0c99131e7897f67
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 10 May 2018 09:38:15 +0800
Tag:    v3.3.6

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

commit df122c79cd3e200f687e7339b19254fdfb3ec930
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 04 May 2018 11:59:31 +0800
Tag:    v3.3.6

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

commit 111f55d95eb6a842c0ecbae1046dc58afd5a5ed2
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 04 May 2018 10:28:08 +0800
Tag:    v3.3.6

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

commit ddc0b2c8056aa5fa6540febba41c84e1eb8e5c8d
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 04 May 2018 09:57:36 +0800
Tag:    v3.3.6

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

commit 9acdfbcddac9fbe1fd001f5e43f2b9f74c4228cb
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 04 May 2018 09:52:16 +0800
Tag:    v3.3.6

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

commit 421628ec0b2b98ee8727b10843a52876f6b34359
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 04 May 2018 09:48:12 +0800
Tag:    v3.3.6

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

commit 61cf3e91785b2e647b4708977be276d1deb57d90
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 04 May 2018 09:23:29 +0800
Tag:    v3.3.6

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

commit 4b51386d9a8fa0bb0cf653f42fd92e18a8ac6bdc
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 03 May 2018 18:04:07 +0800
Tag:    v3.3.6

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

commit 40e33083b7807f3b5e1d1f634e88070491be40e2
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 03 May 2018 14:07:57 +0800
Tag:    v3.3.6

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

commit e98ad2ad05a385052ce198a51ea41a90b50e8114
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 03 May 2018 10:53:54 +0800
Tag:    v3.3.6

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

commit 2aa7deb2f05a58ce18b8c62c89cd40a9aa744f68
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 01 May 2018 09:10:56 +0800
Tag:    v3.3.6

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

commit 1c93fc944428bba11ac54f8091c3553a0c0906f9
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 11 Apr 2018 16:02:31 +0800
Tag:    v3.3.6

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

commit de3f8e2653ffba27799c421104dcf9cab0120b41
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 05 Apr 2018 13:19:01 +0800
Tag:    v3.3.6

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

commit 01d52250a48d1e52d21356692297fe1c50a787bf
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 05 Apr 2018 10:37:46 +0800
Tag:    v3.3.6

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

commit 1b6f7526dffdb36e7d6c449480cf9c485ddd40e3
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 03 Apr 2018 17:54:16 +0800
Tag:    v3.3.6

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

commit 707e1c5527fdf324d380287a7e48aecbeca0598e
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 03 Apr 2018 17:35:58 +0800
Tag:    v3.3.6

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

commit c2abd2c0f0d337eca73612a0eda57b6b8aa34eeb
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 28 Mar 2018 13:35:24 +0800
Tag:    v3.3.6

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

commit 9237d70fc839215bc459d2917fb53b4acc65673e
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 22 Mar 2018 12:06:50 +0800
Tag:    v3.3.6

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