Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle