xsl changes
Merge branch 'gareth'