Merge branch 'MDL-62307_MOODLE_35_STABLE' of https://github.com/maksudr/moodle into...