Measurement of γ from B->Dh decays at LHCb---including the effect of D0-D0bar mixing

I present a measurement of the CKM angle gamma from a combination of three LHCb measurements using the tree decays B -> DK and B -> Dpi. These measurements are based on a dataset corresponding to 1.0fb-1, collected in 2011. In contrast to what was presented at FPCP, these proceedings fully include the effect of D0--D0b mixing on the combination. I also report on the inclusion of new, preliminary results on the Dalitz analysis of B->DK, D->KShh, using a dataset corresponding to 3fb-1, collected in 2011--2012.