Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle