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