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