pydev
Merge branch 'scoped_instances'