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