patcher upgrades
Merge remote-tracking branch 'meticulus/carbon' into carbon