Merge branch 'w02_MDL-30718_m23_usertimedb' of git://github.com/skodak/moodle