Merge branch 'w02_MDL-29684_m23_metaenrol' of git://github.com/skodak/moodle