Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle