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