Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle