xml/html plugin
minor clean-up
Merge with default
documentation removed - CHM appears corrupt
minor changes before 6.1 branch