Merge "Fixing a critical regression in our SAX parsing."