Removing deadline code which does not link happily with standard libxml
Merge branch 'master' into mw_master
Revert "Removing deadline code which does not link happily with standard libxml"

This reverts commit b33683f098e4413ac8b50a8f37ff234ddb1bab26.