Git merges in Moodle 3.5.9 by Adrian Greeve

commit 83fe3c44c0140dc84404bac3ff84316f88659c8f
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Fri, 08 Nov 2019 10:46:34 +0800
Tag:    v3.5.9

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