Free up xml stuff when done.
Merge branch 'master' into rendering_improvements