Staging/release 3.0.2

Updates for the 3.0.2 final release.