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