I'd like to do a 1.7 release soonish, so i don't think we need to do a 1.6.29.6.  Close and resubmit against master?  Or just rebase against master and force-push?