Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle