Git merges in Moodle 3.5.10 by Adrian Greeve

commit a0a03baad810450b0be7ae3de93008adafcbac4b
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 02 Jan 2020 15:19:39 +0800
Tag:    v3.5.10

Merge branch 'MDL-67599-35' of https://github.com/snake/moodle into MOODLE_35_STABLE


commit 0613e56e69c695535675571f01403c9fff0847f0
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Tue, 24 Dec 2019 14:58:52 +0800
Tag:    v3.5.10

Merge branch 'MDL-65809-35-onlyenv' of git://github.com/sarjona/moodle into MOODLE_35_STABLE