Git merges in Moodle 3.3.8 by Jake Dallimore

commit c3db28fe90b2a75ce5d932eb3e6fed0c0316894e
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 06 Sep 2018 09:25:10 +0800
Tag:    v3.3.8

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

commit 772afa0f43f007c6145f69dc3fbc6f6ffde67094
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 30 Aug 2018 13:10:45 +0800
Tag:    v3.3.8

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

commit 5432075187b7b580527a6499e5f3ba17362eebcc
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 28 Aug 2018 16:56:32 +0800
Tag:    v3.3.8

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

commit 9bec7f417ff470975bff13f5675756765a4bbe88
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 15 Aug 2018 11:00:56 +0800
Tag:    v3.3.8

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