Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle