Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle