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