Git merges in Moodle 3.5.10 by Jun Pataleta

commit 7c6be5b319824aa55ac32c5408b53be96efe7914
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 31 Dec 2019 15:18:41 +0800
Tag:    v3.5.10

Merge branch 'MDL-63996-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE