Git merges in Moodle 3.5.9 by Andrew Nicols

commit e92bd648db0b19d0a5669517d384a9dc6b2097c3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 18 Oct 2019 08:29:48 +0800
Tag:    v3.5.9

Merge branch 'MDL-66919_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE


commit f73e64f16661d0ecf185bdccdf6f161c63e662a3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Oct 2019 07:32:17 +0800
Tag:    v3.5.9

Merge branch 'MDL-66335_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE