merge in 3.0.9 release

A straghtforward merge of the last release (from a while ago).