Merge "Fixing some of our XSLT implementation issues."