Merge branch 'w02_MDL-30928_m23_deletetimes' of git://github.com/skodak/moodle