Git merges in Moodle 3.6.10 by Sara Arjona

commit 1cb6257bab8dfbf27e7cc917633167a1b9b68108
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 02 Apr 2020 22:51:26 +0800
Tag:    v3.6.10

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


commit 3820d5d2be06b4875f04a2ee09c674901d653ba0
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 31 Mar 2020 21:09:42 +0800
Tag:    v3.6.10

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