Newer version brought to the tree by TomWij
Merge branch 'gp2tree'