Fixed xml saving on backup.
Merge branch 'test' into dev