Merge branch 'MDL-50406_master' of git://github.com/nadavkav/moodle