Changed implicit relative import
Changes to be compatible with Python 3.3
Merge branch 'migrate-3.3'