Update to pull from 3.0.x branch