Summary of changes: b415cd4... add upstream fix to parser performance bottleneck caused by (*) 8331deb... merge with master (*) This commit already existed in another branch; no separate mail sent