Merge branch 'MDL-70931-310-xmldbeol' of git://github.com/mudrd8mz/moodle into MOODLE...