sbailey Merge branch 'py3' with fixes for python 3