Git merges in Moodle 3.6.8 by Andrew Nicols

commit fd43070bbc7b53c9e9add2d12cf95a937042f955
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 10 Jan 2020 13:03:32 +0800
Tag:    v3.6.8

Merge branch 'install_36_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_36_STABLE


commit 3aa4bf022ae3388dbf2cc0629fd9ac311bec27ae
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 21 Nov 2019 19:46:37 +0800
Tag:    v3.6.8

Merge branch 'MDL-48024_36' of https://github.com/stronk7/moodle into MOODLE_36_STABLE