Merge branch 'w04_MDL-26035_20_installtest' of git://github.com/skodak/moodle