Git merges in Moodle 3.5.13 by Jun Pataleta

commit 64ff6f4e12d3a49dac6554f1ddd8dfa39f0f6cda
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 29 May 2020 16:54:57 +0800
Tag:    v3.5.13

Merge branch 'MDL-68750-master-fix' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE


commit 2ad7c452fade1878328726c82a7a9f85d87ecca2
Author: Jun Pataleta <jun@moodle.com>
Date:   Wed, 27 May 2020 11:24:52 +0800
Tag:    v3.5.13

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


commit 06544c772159640514002b3157e01f0030dd0ac5
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 12 May 2020 00:02:54 +0800
Tag:    v3.5.13

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