Merge branch 'w34_MDL-34901_m24_useraccess' of git://github.com/skodak/moodle