Git merges in Moodle 3.5.13 by Víctor Déniz Falcón

commit 6bd1059042f4af9b57fc747a20253ec0231b1226
Author: Víctor Déniz Falcón <victor@moodle.com>
Date:   Wed, 17 Jun 2020 00:47:36 +0800
Tag:    v3.5.13

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

commit 61e908f935b0685b8449df7ab256291de7c35809
Author: Victor Deniz Falcon <victor@moodle.com>
Date:   Fri, 22 May 2020 21:21:55 +0800
Tag:    v3.5.13

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