Git merges in Moodle 3.6.x by Victor Deniz Falcon

commit d866e7315bfba5a04a051e19f51b9cf13e915fb4
Author: Victor Deniz Falcon <victor@moodle.com>
Date:   Thu, 12 Mar 2020 22:22:37 +0800
Tag:    v3.6.10

Merge branch 'install_36_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_36_STABLE