3.x

Merge in 3.x changes