Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solve...