Merge down my changes from release-4 (and Dave's updated Dream8Banner)