My current research interest is the symbiotic integration of human and machine translation (MT). Machine and human translation can strongly benefit from each other, in multiple ways. There has been increasing evidence that MT can boost productivity of human translators, by providing them with draft translations to post-edit. On the other hand, we recently proved that human post-editing can be exploited to dynamically adapt MT. This opens the way to interesting application scenarios as well as to new research challenges in the field of machine translation, such as learning and adapting from human feedback, and optimising MT performance towards minimum post-editing effort.