Git merges in Moodle 3.5.16 by Andrew Nicols

commit ec31b667b26603c54454b831328e4e2a7ffac4a6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Nov 2020 07:37:48 +0800
Tag:    v3.5.16

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