wrap everything in an eval to avoid rare die() errors from xml treebuilder stuff
Merge branch 'master' into RELEASE_20130723