Merge branch 'w36_MDL-29175_m22_clozearray' of git://github.com/skodak/moodle