Merge changes to master into python3