Merge in 'ptunnel'.