XML escape user input
Merge branch '2-2-stable' into 2-2-dev