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