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