Python 3 import support
Merge branch 'master' into stable

Python 3 import handling