Enthought merge

This brings in easily mergeable changes from the enthought private branch.