Merge branch 'MDL-41235-master' of git://github.com/phalacee/moodle