Remove deprecrated objects
More Py3k fixes
Merge remote-tracking branch 'upstream/master'