XML logging foundation
Merge branch 'master' into Danny