Updated version number for 6.0.2.
Merge branch 'release-6.0.2'