Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle