Merge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle