Sounds good to me and no problem on the rebase... I wasn't sure how you guys work this and if you guys wanted to do the rebase a moment before merging.  Will do both