[PATCH] Infamous 'octopus merge'