Import treetop commit 6551d549ef92