Git merges in Moodle 3.5.13 by Andrew Nicols

commit a449ad1ae0b4939210b010fd795d548d7d715192
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Jul 2020 12:23:08 +0800
Tag:    v3.5.13

Merge branch 'm35_MDL-66322_Travis_Run_Using_Docker_ExtTests' of https://github.com/scara/moodle into MOODLE_35_STABLE

commit c85a85e1d6f707b6a86ae12c2c746a17793e71df
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 25 May 2020 15:50:07 +0800
Tag:    v3.5.13

Merge branch 'MDL-68658_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE