Merge branch 'mdl51440-master' of git://github.com/tlock/moodle