Git merges in Moodle 3.3.9 by David Monllao

commit 2709ae4dcc526c647978da953fd4c3ffe433b31f
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 31 Oct 2018 13:47:59 +0800
Tag:    v3.3.9

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


commit 026b1ffe51a38bb57e6980d0b58989bd74540456
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 17 Sep 2018 19:46:17 +0800
Tag:    v3.3.9

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