Git merges in Moodle 3.9.3 by Shamim Rezaie

commit 7d2514397920c512fbd066e3fb4aa6dfad05d8b5
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 30 Oct 2020 11:56:03 +0800
Tag:    v3.9.3

Merge branch 'MDL-69390-39' of git://github.com/bmbrands/moodle into MDL-69390-39-test