Merge with master. This contains fixes to the muonID that allow to cope with the new geometry for the upgrade.