Merge "Fix WDDX formatted output"