Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle