Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle