Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle