1.0.2 release
Merge branch 'release-1.0.2'
staging awareness