Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle