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