Merge "Fix version to reside in setup.py"