Fixed setup.py and changelog.
Merge branch 'master' into fix-browser
Merge branch 'fix-browser'