Merge 3.4 (faulthandler)