Merge branch 'w34_MDL-34873_m23_tagstrict' of git://github.com/skodak/moodle into...