Merge in the latest version of GoodCitizenCascades

Let's try it again.