Issue #453 - Family Tree Picture Error
Merge branch '3.4.1' into 3.5.0