Part fix for #6923 language not being set.
Tidy up xml, bump version