Merge branch 'w03_MDL-31213_m23_attributesmess' of git://github.com/skodak/moodle