Merge David (and Vice-Pré) branch

They worked so we have to merge man