Git merges in Moodle 3.6.8 by Jake Dallimore

commit 8ac197d07f007d0501ed11adc61ad37c0e5bc00c
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 03 Jan 2020 11:25:12 +0800
Tag:    v3.6.8

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