Merge branch 'MDL-36061_userid_23' of git://github.com/andyjdavis/moodle into MOODLE_...