Merge "Committers: Remove Maxime, add Bjorn & Henrik"