Fixed some bugs with double XML escaping
Merge remote branch 'origin/master' into laura_client2