Merge branch 'MDL-26440_uid' of git://github.com/andyjdavis/moodle