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