Git merges in Moodle 3.3.8 by David Monllao

commit 1c2efd6f1b6ae5fb0e8ae03ed50e9e566e3a7b47
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 04 Sep 2018 20:34:19 +0800
Tag:    v3.3.8

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


commit 6069d11046527b1e96049011f94d7f7efc60397a
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 27 Aug 2018 17:59:37 +0800
Tag:    v3.3.8

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