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