Fix import problems with __import__
Merge branch 'master' into develop