Merge branch 'w51_MDL-37254_m25_courseinfoas' of git://github.com/skodak/moodle