Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle