Git merges in Moodle 3.6.8 by Eloy Lafuente (stronk7)

commit 050ab7d47986a6867029c703e0953f9c9a090812
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2020 06:00:17 +0800
Tag:    v3.6.8

Merge branch 'MDL-67469-36' of git://github.com/junpataleta/moodle into MOODLE_36_STABLE