Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle