Merge branch 'w07_MDL-26381_20_changepw' of git://github.com/skodak/moodle