Fix bug: Looking for namespace for prefix "xlink"
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x