Git merges in Moodle 3.5.6 by David Monllaó

commit c344124599818c593df1b33341907bc5824d39ca
Author: David Monllaó <davidm@moodle.com>
Date:   Mon, 22 Apr 2019 19:17:00 +0800
Tag:    v3.5.6

Merge branch 'MDL-65102-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE