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