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