Merge pull request #803 from jmaas/master

Get tree's in sync