Merge Pods 2.4 changes into Pods 3.0

Not sure if this will work automatically, but it's worth a shot... right?