Merge branch 'w42_MDL-29886_m22_md5js' of git://github.com/skodak/moodle