try to fix some redirect issues
Merge branch 'diffbot-testing' into testing

Conflicts:
	XmlDoc.cpp