Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle