@robclewley , your branch is far behind `master` and your changes base on pre-Python 3 version, so be careful while solving merge conflicts.