removed one indentation level
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tree.php