Merged VRT work-in-progress from eb/vrt2 (11518:11598) into trunk.