Merge branch 'MDL-52625_master' of https://github.com/nadavkav/moodle