Git merges in Moodle 3.5.8 by Andrew Nicols

commit fa319a92b827cc06005bb468783769957a7552be
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 16 Aug 2019 11:07:09 +0800
Tag:    v3.5.8

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

commit 648e72316d013ed8eaac54eac2f0935d241c15fd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 09 Jul 2019 11:01:05 +0800
Tag:    v3.5.8

Merge branch 'MDL-65965-35-fix' of git://github.com/junpataleta/moodle into MOODLE_35_STABLE