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