My version of Matt's --trust-rename patch.