Git merges in Moodle 3.6.8 by Adrian Greeve

commit 25dcb6f19376503d54fe8fe30457a518f90bebc2
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 02 Jan 2020 15:18:37 +0800
Tag:    v3.6.8

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

commit 10e40f036655319468aee5518562c1205dab5dac
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Tue, 24 Dec 2019 14:57:21 +0800
Tag:    v3.6.8

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