3.x

Merging in changes.