Merge this branch first. The python 2 to 3 updates have already been merged to the master branch by Lloyd.