Added 2.2.x mangle fix to old mangle code in HEAD.