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