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