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