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