Merge branch 'm20_MDL-14934_excel_time' of github.com:dongsheng/moodle