Fix setup.py.
Bump version for release.
Merge branch 'release/4.6'