Upgrade pip to 6.0.2
bump version for release of 12.0.2
Merge branch 'release/12.0.2'
correect changelog