Git merges in Moodle 3.5.7 by Jun Pataleta

commit eafc231dd85c325609dc0db08d330e5f4369b36f
Author: Jun Pataleta <jun@moodle.com>
Date:   Wed, 22 May 2019 19:31:07 +0800
Tag:    v3.5.7

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