Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle