Merge branch 'w12_MDL-32052_m23_authtype' of git://github.com/skodak/moodle