Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle