3.0-SG catchup merge after git changeover and merge with master (more to do)
merged from master, another royal mess that git really didn't do a very good job of handling