#1150754 - float issue with pedigree tree in 1.4.0 svn14855
#770024 - merge data from two different family-trees faulty
Tidy up code