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