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