Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle