Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle