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