Merge "clean up snapshots" into release-1.1.0