This turned out to not be needed.

The `setup.py` itself was sufficient on rtfd.org.
Merge remote-tracking branch 'upstream/2.x' into 2.x
Getting back on the correct track where 2.x is based on master
Fixes #167

Updated changelog with fix info

closes #167