Git merges in Moodle 3.5.14 by Andrew Nicols

commit 25cfc3c9f28a68f92a2a5d07751765171aa6ce61
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Aug 2020 08:32:28 +0800
Tag:    v3.5.14

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


commit 5dd88c28d713c1f6035583a58c8dd66ba7d33f89
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 20 Aug 2020 07:37:24 +0800
Tag:    v3.5.14

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