Merge branch 'MDL-58079_master' of https://github.com/kiklop74/moodle