Several updates to cover omissions noted by Rich Salz.
This closes SF bug #458771.
1 file changed