python 3 support
Merge branch 'python3' into current-anmar